summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE ANYWHERE"HEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4Treehugger Robot2021-07-0410-23/+15
|\
| * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-0310-23/+15
|/ | | | | Auto-generated-cl: translation import Change-Id: I9a01a2fc9bb353a32df74bdaf0d940490a7ae2f0
* Merge "DO NOT MERGE - Merge RQ3A.210605.005"Xin Li2021-06-218-12/+20
|\
| * DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-188-12/+20
|/| | | | | | | | | | | Bug: 190855093 Merged-In: Idf99507b8993c798e6a1b0bf910d4593b8b96bff Change-Id: I22c064b66b08bea12febc93b23588f593bbd91b7
| * DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li2021-06-170-0/+0
| |\ | | | | | | | | | | | | | | | Bug: 190855093 Merged-In: Iba2ec0bce69b7e53517f638a0b09c2542c6cd72d Change-Id: Idf99507b8993c798e6a1b0bf910d4593b8b96bff
| | * Snap for 7239954 from f587814d825c341be346cbf4165c23d854d091bd to ↵android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot2021-03-271-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | rvc-qpr3-release Change-Id: I96df894e89c72d6f4a9b05a52f9b9fbd83af8e1b
| * | \ Merge "DO NOT MERGE - Merge ab/7272582" am: 8a7ed9e553Xin Li2021-06-140-0/+0
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1736002 Change-Id: Iba2ec0bce69b7e53517f638a0b09c2542c6cd72d
* | | | Merge "DO NOT MERGE - Merge ab/7272582"Xin Li2021-06-140-0/+0
|\ \ \ \
| | * \ \ DO NOT MERGE - Merge ab/7272582 am: f8b8823018Xin Li2021-06-140-0/+0
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1736002 Change-Id: I1d86a80d2d787aa2597dee50fa6b9ba344eaeb62
| * | | | DO NOT MERGE - Merge ab/7272582Xin Li2021-06-110-0/+0
|/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 190855093 Change-Id: I30d094f571b665405be97af32d8c5632a1eb9d62
| * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵temp_ab_7272582Bill Yi2021-03-270-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f587814d82 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/14009105 Change-Id: Ief0af3b7e58f470e68ed35b7fca060a083870b07
| | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-03-261-3/+3
| | | |/ | | |/| | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I8c2c416817352fce560a462b163db6dafbb77ffd
| * | | Merge "Fix typo in KeyChainService." am: 0cc20d00ed am: 174487c434Janis Danisevskis2021-03-231-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1649894 Change-Id: I2b0f27ff66d925cbe6ae8cad876e7efde3afde5b
| * \ \ \ Merge "Keystore 2.0: Remove all references to Keystore 1.0" am: cbf105a553 ↵Treehugger Robot2021-03-231-31/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bb1e25c988 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1634281 Change-Id: Ibf4f9caee0485ba18e15b369151e4371c715465f
| * \ \ \ \ [automerger skipped] Merge "Merge RQ2A.210305.007" am: ef108ea1e1 -s ours ↵Xin Li2021-03-030-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 58b87ff37c -s ours am skip reason: Change-Id I08dd82c6edc2418148378e638cf0abd221d9e4df with SHA-1 f7ebfa4535 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1612531 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I285d071db1b0c19ba2048a89ed1ee13ee96177f3
| * \ \ \ \ \ Merge "KeyChain/Keystore 2.0" am: 4d9cd24e64 am: f7ebfa4535Treehugger Robot2021-02-247-373/+564
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1560128 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I75dcc8c1e6befe20e8e41902d558b99c417e6c60
| * \ \ \ \ \ \ [automerger skipped] Merge ab/7061308 into stage. am: a02620169c -s oursXin Li2021-02-230-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I11cd422148f9eedc0ebd10e4b692da32ae339c10 with SHA-1 573b55259d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/13658400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1e04e0f60e8b425d35256729b1370e8d06c75f5
| * \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/KeyChain" am: ↵Bob Badour2021-02-194-0/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24640a1c84 am: d9a0b573a3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1588406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23f9d72ef03a530f48b0e51622604313beefa2a4
| * \ \ \ \ \ \ \ \ Merge "Handle null case KeyChain getPredefinedAliasForPackageAndUri" am: ↵Treehugger Robot2021-02-181-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acb5deee41 am: 3b3d5dc184 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1570647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I25f50419bc2a5de4b2f580432d8823d595b85651
| * \ \ \ \ \ \ \ \ \ Merge "Update KeyChainService caller checks" am: 79b8834964 am: e4da0c010aRubin Xu2021-02-171-3/+22
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1570646 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia17eb69eb26756011d1c0525c508334a76f74a3c
| * \ \ \ \ \ \ \ \ \ \ Merge "Add cred mng app metrics to KeyChain" am: dfb9e12b6d am: fd69599721Rubin Xu2021-02-161-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1570645 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If44935f12bddcb94d293d76b074be57acb64b43e
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Centralise logic for setting credential manager app" am: 679f3ffd53 ↵Treehugger Robot2021-02-151-33/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 78e8959350 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1545467 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2affc8559b5f72e5d0baac1643e87bc4219c54eb
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add DPM.getKeyPairGrants()" am: 3de79b4663 am: 1f3bc50d1aRubin Xu2021-02-144-0/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1545466 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29e25d64c82cb2f5fc209c8f0c04878aa550aad1
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add KeyChain implementation credential management app" am: f0fcc57b93 ↵Rubin Xu2021-02-144-15/+400
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b793689047 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1545465 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1dfa28f4619c687627429ccaf9cb615f3ef0645
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "dpm_haskeypair" am: ae55bc73eb am: 15272fbfd4Rubin Xu2021-02-042-0/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1545464 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia578e78703018ab0111c9fd9cfd8d8f19e2c0ab8
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Revert "Add check for misprovisioned Pixel 2 device." am: 7a4bacbb0b am: ↵Eran Messeri2021-02-041-26/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86a00f126d Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1549374 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1152bf0bdb46fc9e832c0bebfc185e081bfc9f5d
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "KeyChain: use unbundled version of BouncyCastle. BouncyCastle APIs ↵Daulet Zhanguzin2021-01-272-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot be exposed by updatable ART module." am: f4fb66a22c am: 09b06b1013 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1556130 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4bff55012add210f0e0e9af059707d42777c2c2b
| | | | | | | | | | | | | | | | | | * Merge "Add Alex, move myself to emeritus owners section" am: 1a757c73f3Treehugger Robot2021-05-071-1/+2
| | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1697453 Change-Id: I7581e8e4c4a4b408a49d6ee77696380875193f5b
* | | | | | | | | | | | | | | | | | | Merge "Add Alex, move myself to emeritus owners section"android-s-beta-2android-s-beta-1Treehugger Robot2021-05-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add Alex, move myself to emeritus owners sectionEran Messeri2021-05-061-1/+2
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex has done a formidable job adding new functionality into KeyChain and fixing issues it has. Adding her as an owner and moving myself to emeritus section. Bug: 187395769 Test: N/A Change-Id: Id11ba46730ccb08901ef50360e931b4bbc8c6475
| | | | | | | | | | | | | | | | | | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot2021-04-230-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | |/|/ | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | 8e54345a1f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1684447 Change-Id: Iad4ba89ac1df171b13856996193665aa49f71568
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot2021-04-238-20/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-04-228-20/+12
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I0cbd2910d6a6b1b915e19a4a609d9bfd4f135681
| | | | | | | | | | | | | | | | * / Merge "Fix typo in KeyChainService." am: 0cc20d00edJanis Danisevskis2021-03-231-5/+5
| | | | | | | | | | | | | | | |/| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1649894 Change-Id: If3332c43b958e6585e8b4982a0b4fe8b2f9200f2
* | | | | | | | | | | | | | | | | Merge "Fix typo in KeyChainService."Janis Danisevskis2021-03-231-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix typo in KeyChainService.Janis Danisevskis2021-03-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: N/A Change-Id: I072f393988c5a00345f3982183e3db283d21d393
| | | | | | | | | | | | | | | | * | Merge "Keystore 2.0: Remove all references to Keystore 1.0" am: cbf105a553Treehugger Robot2021-03-231-31/+17
| | | | | | | | | | | | | | | |/| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1634281 Change-Id: Ib6a4a2c6192defe4fcb7c9490ac1e6f0b27b2296
* | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Remove all references to Keystore 1.0"Treehugger Robot2021-03-231-31/+17
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Keystore 2.0: Remove all references to Keystore 1.0Janis Danisevskis2021-03-231-31/+17
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 171305684 Test: N/A Merged-In: I76ae3ab858cf600907f9d0fcd164efba231f3077 Change-Id: I76ae3ab858cf600907f9d0fcd164efba231f3077
| | | | | | | | | | | | | | * / [automerger skipped] Merge "Merge RQ2A.210305.007" am: ef108ea1e1 -s oursXin Li2021-03-030-0/+0
| | | | | | | | | | | | | |/| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I08dd82c6edc2418148378e638cf0abd221d9e4df with SHA-1 f7ebfa4535 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1612531 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I204b0c685184ad2eaa64b1c8ea5f60b6143d02af
* | | | | | | | | | | | | | | Merge "Merge RQ2A.210305.007"Xin Li2021-03-036-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Merge RQ2A.210305.007Xin Li2021-03-036-8/+16
|/| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I08dd82c6edc2418148378e638cf0abd221d9e4df Change-Id: Iab3261ab1140c046c2c5d56cc560eed319713ec8
| * | | | | | | | | | | | | | Merge "KeyChain/Keystore 2.0" am: 4d9cd24e64Treehugger Robot2021-02-247-373/+564
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1560128 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I08dd82c6edc2418148378e638cf0abd221d9e4df
* | | | | | | | | | | | | | Merge "KeyChain/Keystore 2.0"Treehugger Robot2021-02-247-373/+564
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | KeyChain/Keystore 2.0Janis Danisevskis2021-02-237-373/+564
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Key uses mostly public Keystore API which works the same for Keystore and Keystore 2.0. The only exception is: * The public API does not allow for grants. In this cases we fall back on hidden API. Keystore 2.0 and KeyMint do not allow for key attestation outside of key generation or import, so this patch also removes attestKey from the KeyChainService implementation. Test: KeyChain tests and CTS tests. Bug: 171305387 Merged-In: Ieefaba81e36dc0adc87d0eebde8a0901c1687960 Change-Id: Ieefaba81e36dc0adc87d0eebde8a0901c1687960
| * | | | | | | | | | | / / Merge ab/7061308 into stage.Xin Li2021-02-216-8/+16
| |\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I11cd422148f9eedc0ebd10e4b692da32ae339c10 Change-Id: I2df1b83c54fd6924ba63a49c8eec472280bf0064
| | * | | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: ↵Xin Li2020-12-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3680f5a0e -s ours am: 84befb93ee -s ours am skip reason: Change-Id Ide0ea0f95c6b4ed26e57a813af9b18df722a9d50 with SHA-1 02bfbd4a1c is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1520844 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11cd422148f9eedc0ebd10e4b692da32ae339c10
| | * \ \ \ \ \ \ \ \ \ \ \ DO NOT MERGE - Merge RQ1A.201205.011 am: 02bfbd4a1cXin Li2020-12-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/13177025 Change-Id: Ia93cbc3628923bbbd7723967207fae67d3fd50e9
| | * \ \ \ \ \ \ \ \ \ \ \ \ DO NOT MERGE - Mark RQ1A.201004.001 as merged am: e4a1ebe6e6Xin Li2020-12-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/13176356 Change-Id: I7ea969cd9bd33b7ee3fe113cbd1b850098dc3ab8
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-12-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56f0958897 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/13168414 Change-Id: I52cdf3e536377a698b938e950cca1c2d08a73296
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-09 21:37:47 +0000