summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am: bc111e2806 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I4e6a5e0fd5b8bc6f2f4df90b7527faebf29db212 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am: 4944e00877 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: I58d7e5a4eb3aa82707476eba49e36c4ed5c3a359 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: aa16850ae1 -s ours" into main
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 1cd2017582 -s ours" into udc-d1-dev-plus-aosp
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: aa16850ae1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I972d2004b2b227f932def76e62db33123a5c84a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I61150d0659e8c8d2b4ff7b7face68e0e6fb01147 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 477a66cc75 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I2a5bfd43edba8b79de022f017a6d6ef11789f179 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am: fc5558a9b7 -s ours am: 4d6c0d31d0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: Ib2f55b19ccd71747a08a649bcdc4ca785b3b483c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I87bfc2fe48470e0aa1dbb0162397e44171e0561b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I0c5555c4a1210209810889811a9717a3485723a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am: fc5558a9b7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: I8e8e72e45b96003700b16b7767eeed4e946d0596 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I0c3a9c836be58a1c50770a196d1ee067275db9b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I48fd26de4272bb61acabacfe224406f3fd9e6415 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: I037519805ce0d5cb90ac091032fa9abb88e6b054 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: I7a86bd8a41676559b4d6ce2ca07dfeb0642dee0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82ad1fd533 -s ours am: 99a3be4d83 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835941 Change-Id: I04d8cb385b4075248d9b0401fa23afd657f19185 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82ad1fd533 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835941 Change-Id: Iea750d0475a77593690df51ece391159ee91ad97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifdf92e5fc798c23ff4de4cc6a0d12f6c56369599
2023-09-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I087e55f7e3851b09bb636a9e6d42744ea6b33737
2023-09-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3269ea9cba5b52352450a31589addd8744b0d7bb
2023-09-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iad2c33f9d1a7bb416b3d36d788cd0989c8f00f17
2023-09-19Merge "Handle failure to connect to KeyChainService." into udc-qpr-dev am: ↵Pavel Grafov
fab06f85e1 am: 29f75b818b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24690186 Change-Id: I2de3ffd6e02e8a83cc72b1b36c3ba6607a02e489 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Handle failure to connect to KeyChainService." into udc-qpr-dev am: ↵Pavel Grafov
fab06f85e1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24690186 Change-Id: Iaeeb4d849cef8ef790b80368cbca8d9a47e88e77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Handle failure to connect to KeyChainService." into udc-qpr-devPavel Grafov
2023-09-07Handle failure to connect to KeyChainService.Pavel Grafov
KeyChain.bind() throws AssertionError when it fails to connect to the service. If a requesting activity is destroyed, its context will be invalid and connection attempt will fail. When this happens in an AsyncTask from KeyChainActivity, it crashes the process because the current catch-all case doesn't handle AssertionError which isn't derived from Exception. Note: Normally it is ill-advised to catch Errors, but in this case it shouldn't have been an AssertionError in the first place and currently the app crashes anyway. Bug: 178967747 Test: atest CtsDevicePolicyTestCases:android.devicepolicy.cts.KeyManagementTest Change-Id: I917acb5d1594a8bb867744f56688407b0cda95ee
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1ec7b2cee6 -s ours am: 70f39e20cd -s ours am: 6929707ad3 -s ours am: a4daa8b312 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24613198 Change-Id: I11c6e9c27f6310a8248f59fc84c50c30f8d29860 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1ec7b2cee6 -s ours am: 70f39e20cd -s ours am: 6929707ad3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24613198 Change-Id: Ic3f0a9ed077d0e4be23744397fe2c305c39dd1e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1ec7b2cee6 -s ours am: 70f39e20cd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24613198 Change-Id: I0ab3187829d94d7214368d4547d1d23a45310ad7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1ec7b2cee6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24613198 Change-Id: I82a104a913729541c13597c14b9f3d4c54248e34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30Import translations. DO NOT MERGE ANYWHEREtmp_amf_298295554Bill Yi
Auto-generated-cl: translation import Change-Id: Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 547bb17f27 -s ours ↵Xin Li
am: b543a14478 -s ours am: eccfe4468f -s ours am: 6347e0e6c8 -s ours am skip reason: Merged-In I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 with SHA-1 7052829ba8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24182592 Change-Id: Idf2ac00bcd4b25c3bbffd0c5067fb76a5e580ae1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 547bb17f27 -s ours ↵Xin Li
am: b543a14478 -s ours am: eccfe4468f -s ours am skip reason: Merged-In I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 with SHA-1 7052829ba8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24182592 Change-Id: I751bd9efa0b32f5161d15e6023c0c9faee570217 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 547bb17f27 -s ours ↵Xin Li
am: b543a14478 -s ours am skip reason: Merged-In I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 with SHA-1 7052829ba8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24182592 Change-Id: Ia9d119a40820a84cf6b795809904d0451c7d1eef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 547bb17f27 -s oursXin Li
am skip reason: Merged-In I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 with SHA-1 7052829ba8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24182592 Change-Id: I501191cecd871457a762fe9ff275748ddf557cec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: ↵Rubin Xu
8e82f52583 am: f5a7476220 am: 8e91d14fa4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I12cde72810f79235287b8b7942b10aa4500de390 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: ↵Rubin Xu
8e82f52583 am: b531dc529b am: 747f5700d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I0b727513b743471cae43fec3b40dce96cd4503ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: ↵Rubin Xu
1fa3a00ade am: 381073296a am: 0c7d284d3b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I176b47265545baa019c0f09fb62effda2f0d5055 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: ↵Rubin Xu
8e82f52583 am: f5a7476220 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I4b1fa9fcc2ea719f6ffefae258f50f8a94d7c841 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: ↵Rubin Xu
8e82f52583 am: b531dc529b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I8ae17b515d6c7c61a3c607c4c3e5614803fbc3a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: ↵Rubin Xu
1fa3a00ade am: 381073296a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I77fd957f67e1327bc820686a35b8bf846d5bc160 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: 8e82f52583Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I60f936ee0b0b6df7dd730ba150b005b1cc20626b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: 8e82f52583Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I1f42b6d18e9452ef9c2f3460fdb13f3f865abdee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: 1fa3a00adeRubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I4a8db120009571e838ea73ea0c2cadf07ae0f098 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827 am: b3bb0538a7Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I9efa0a7a9cdfe495a240717df9483ccb21431f81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: Ia1a573c16da8057104b1b0184492081869225633 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I0a1cef80d80ee54253253350bd953b68e4599d9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4aba am: ba85a67827Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: Id9659ab6e733c3af935d882dd7eeaa9f245bb4c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Always call IKeyChainAliasCallback am: fe80ea4abaRubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24240247 Change-Id: I3b72dce173f769789d15d76c84481a7c51861cc4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 Change-Id: I5ae379e8cd3183ef351afa5e7f22d4ec279b4ca8
2023-07-28Always 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 (cherry picked from commit 4cb1a942d76c0d25a271d96a9e544a0457f51a19)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 10:51:09 +0000