summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-30Import translations. DO NOT MERGE ANYWHEREtmp_amf_298295554Bill Yi
Auto-generated-cl: translation import Change-Id: Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 Change-Id: I5ae379e8cd3183ef351afa5e7f22d4ec279b4ca8
2023-06-26[automerger skipped] Merge "Merge Android 13 QPR3" am: b65420c952 -s oursXin Li
am skip reason: Merged-In Ibd9bc8213a073350d31c7d67b793fd98b0240166 with SHA-1 48899ad7fe is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2635405 Change-Id: Ibc401d20057eb0fc61d414cc383aa839d7268a00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: f680eb41a1 -s oursXin Li
am skip reason: Merged-In Ibd9bc8213a073350d31c7d67b793fd98b0240166 with SHA-1 48899ad7fe is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2635405 Change-Id: Ie803590b629b4ed983c64f8b24fd22370d1693bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26Merge "Merge Android 13 QPR3"Xin Li
2023-06-21Merge Android 13 QPR3Xin Li
Bug: 275386652 Merged-In: Ibd9bc8213a073350d31c7d67b793fd98b0240166 Change-Id: I4ac5c94eb73fbe517f921231ae76df2c8581cbfe
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
5d5536ac20 -s ours am: 48899ad7fe -s ours am: b354999b64 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2614712 Change-Id: I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba280d4e56 -s ours am: 5d9aa214e2 -s ours am: c4f5490138 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2614712 Change-Id: If940e1fad9d40374a81f41277a025f13f94d2aaa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
5d5536ac20 -s ours am: 48899ad7fe -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2614712 Change-Id: Ia45f4b2f558e31df3a759da742aa969e3bc99aaa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba280d4e56 -s ours am: 5d9aa214e2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2614712 Change-Id: Ic98ddcf0441d01c175e172d7e2e8c2a4a89750be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵temp_275386652Treehugger Robot
5d5536ac20 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2614712 Change-Id: Ibd9bc8213a073350d31c7d67b793fd98b0240166 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba280d4e56 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2614712 Change-Id: Ic32fea295762c29b9c6c8864968fe8ce0ab4294b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id98f2d247c3f06244afe438500657d05df1215ae
2023-04-27Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp ↵Treehugger Robot
am: ed577b9b1f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22794569 Change-Id: I0db343f9cbfd3f7fa7fcf2df4725ab17340f425c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0949913b0c -s ours am: 6f5c1fe14e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22794569 Change-Id: I1cca2d21f4ff238f532aece83dc1f8f926e75dac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android14-devBill Yi
0949913b0c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22794569 Change-Id: I576feed3df98efbc76e650bbc38af52fc591f080 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aospTreehugger Robot
* changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0949913b0c Import translations. DO NOT MERGE ANYWHERE
2023-04-25Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aospTreehugger Robot
* changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0949913b0c 2p: cadcd8a9cb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0949913b0c Import translations. DO NOT MERGE ANYWHERE
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5b951ce933 -s ours am: 2587a1ea99 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22801337 Change-Id: I1bf6040579decf2a50b1c122eacab0e552f46861 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5b951ce933 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22801337 Change-Id: I20891917fa36059bf469f4e516fb63eb6c141cac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
21367157ab -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22793297 Change-Id: I6d8a04e9514a74c180c33ca04e381c357d93cf5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0949913b0c ↵Bill Yi
2p: cadcd8a9cb Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22794569 Change-Id: Id6b4ae4c2bd5243d0c3f366ef9bff2a7c8bf7fe7
2023-04-22[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0949913b0cBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22794569 Change-Id: I06579d789ed6b6271aa297d0e76a859369023377
2023-04-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Icad2887ecc49574fd38e72f40f3a09c7be3d6485
2023-04-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idc7ee1b4fbfe6e3ec8bc592b1674decef79daa0f
2023-04-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2cb4c55a8c37e09313e0a28820419d74f575a4d3
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: a2084d84de -s ours am: 9a62028813 -s ours am skip reason: Merged-In I27ee426ce73c17a2e3fc1b501ef8f49be65ae109 with SHA-1 d2c176172d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22722396 Change-Id: I30bcffcfafba35895936c49c0656283fcef17ca2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: a2084d84de -s ours am skip reason: Merged-In I27ee426ce73c17a2e3fc1b501ef8f49be65ae109 with SHA-1 d2c176172d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22722396 Change-Id: I3a27b686be9b26766404100faa0b4ed73688f9d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994Xin Li
Bug: 275386652 Merged-In: I27ee426ce73c17a2e3fc1b501ef8f49be65ae109 Change-Id: Ied30aa582b301261e0a502cf12c299cbfcfdd712
2023-04-04Always call IKeyChainAliasCallbackRubin Xu
At the moment the logic in ResponseSender does not invoke IKeyChainAliasCallback.alias() when there is exception or when the alias is not user selectable. This breaks the control flow and causes the invoking app to wait indefinitly for the alias selection process to finish. Fix this by calling IKeyChainAliasCallback.alias() with null when error occurs. Strictly speaking this is a change of behaviour for the case where alias does not exist: prior to U, setGrant() will finish non-exceptionally on a non-existent alias, so we call IKeyChainAliasCallback.alias with mAlias. Starting from U, setGrant() will throw on a non-existent alias and after this change we will call IKeyChainAliasCallback.alias with null instead. One could argue that the new behaviour is actually more correct: in KeyChainAliasCallback API contract, null denotes no certificate is chosen, which is more aligned with the non-existent alias case. Bug: 272468831 Test: manual Change-Id: I084db75d522697603d28d137793088e44b9a6e1d
2023-04-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3352eaaed74ec561abea6f516751812d01bec4e8
2023-04-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d2c176172d -s ours am: 70c0cdac1e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22393195 Change-Id: I60c6b5b7dea3a9bebb53bbe88900fc608f4d0084 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d2c176172d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/22393195 Change-Id: I8ba48c551d0c6e4a362f67f89a4856b52f83fec5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31Import translations. DO NOT MERGE ANYWHEREandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseBill Yi
Auto-generated-cl: translation import Change-Id: I27ee426ce73c17a2e3fc1b501ef8f49be65ae109
2023-03-16Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: 9e34a097be am: 777a476b26 am: 8042d4b26a am: bc547ccd1a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21778940 Change-Id: I86062ed8f7d9ef137d22a8f06fb4461b6436e97a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: 9e34a097be am: 777a476b26 am: 8042d4b26a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21778940 Change-Id: I6e53ede00d7bc5ba5f846abaf6a24ee8abc07057 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: 9e34a097be am: 777a476b26 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21778940 Change-Id: I5ba04fcc7b592cbeac2cd75f1366ea6a4896bc1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: 9e34a097be am: 90d64909f7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21778940 Change-Id: Ia25c3dadc8749733b4cbc22fa2da4a97c9b83a24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: 9e34a097be Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21778940 Change-Id: I4706997cb40c80b95421546936bd8c8004d7d854 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. am: 9e34a097be Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21778940 Change-Id: Ia6c1cdb22b5a73fc526c7d12a061f43b9769da36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Upgrade robolectric to /external/robolectric to prep for removal of ↵Rex Hoffman
/external/robolectric shadows. Bug: 261728063 Test: atest KeyChainRoboTests 4 new test failures (breaking the threading model of the MainLooper). 25 tests have been fixed. Change-Id: I1239fa5681860377e84616d85b7085f3fd8cd23d
2023-02-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8ea1780a83 -s ours am: ff30e78b09 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21604807 Change-Id: Ie8e003b91aa8567bb6d1a2ce88b5d2a8e42b32b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8ea1780a83 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/21604807 Change-Id: I082df4d083897858e5efe24c9fc0231201ae2c2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-26Import translations. DO NOT MERGE ANYWHEREandroid-u-beta-1-gplBill Yi
Auto-generated-cl: translation import Change-Id: If4a001679801bf49bcbee8e6307a4c17d338e199
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
9ee6b50177 -s ours am: 7f20474835 -s ours am skip reason: Merged-In Ibd695efe6139b9558ca3b1210b48d42ccdb79ff1 with SHA-1 6f8ef0bb74 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/20956743 Change-Id: Idce6641dc7a1c4d9de9fb4bec06b61460d5cc785 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
9ee6b50177 -s ours am skip reason: Merged-In Ibd695efe6139b9558ca3b1210b48d42ccdb79ff1 with SHA-1 6f8ef0bb74 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/20956743 Change-Id: Ie84f6e037d053fd70cf4eef9f6a1202c18a2843b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12[automerger skipped] Use Mockito 4.6.1 API am: 93e79b56c2 am: f196bbe74b -s oursSorin Basca
am skip reason: Merged-In I88993aa86c4ed3e1626340cca857b01a8df3b6ec with SHA-1 93e79b56c2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/20838149 Change-Id: Ie433b165252edea2e5dc64a1ed7809b848d5e6c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: Ibd695efe6139b9558ca3b1210b48d42ccdb79ff1 Change-Id: Ic84beaaff12151a94cb938f8ae3562ef0fd3a661
2023-01-11Revert "Use Mockito 4.6.1 API am: 93e79b56c2 am: fe4f05c193 am: ..." am: ↵Kevin Liu
fa4aa8368f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/20944176 Change-Id: Id8f2d026f8d012d3e09636b1a40979032f63f29a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 22:29:02 +0000