summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-04Do not try to initialze the access control enforcer in NFC API am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devJack Yu
8ca26b9e6c am: 8e8c2e3186 am: 1371b44d5b Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1688294 Change-Id: I9307fa05a2ad6d7ac8c04d713645cd035d611486
2021-05-04Do not try to initialze the access control enforcer in NFC API am: ↵Jack Yu
8ca26b9e6c am: 8e8c2e3186 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1688294 Change-Id: I7bc10ba04828194c7f9caf9a7d7a5434a717cae2
2021-05-04Do not try to initialze the access control enforcer in NFC API am: 8ca26b9e6candroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Jack Yu
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1688294 Change-Id: I6cd5f1d2775b8a55e1d3e7bb6eb714434d1494f1
2021-04-29Do not try to initialze the access control enforcer in NFC APIandroid-s-beta-2android-s-beta-1Jack Yu
If there is temporary failures in access rules retrieval, Secure Element service should handle the re-initialization. NFC transactions usually need to be completed in short time and should not wait for the access control enforcer re-initialization. Bug: 186588474 Test: HCE test in CtsVerifier Change-Id: I6e6dd8c05622ff67f6b75a8a93d0db0d35bc7056
2021-04-14Improve isNfcEventAllowed am: cba6328078 am: e8b9e10170 am: a8e168dc77George Chang
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1673187 Change-Id: I86143c09912b6292e3321e5cd51b3dcf877e4531
2021-04-14Improve isNfcEventAllowed am: cba6328078 am: e8b9e10170George Chang
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1673187 Change-Id: I868489737a52d48fe458d1bc794a9e409f980303
2021-04-14Improve isNfcEventAllowed am: cba6328078George Chang
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1673187 Change-Id: Id8fa28ac5d0501f2f4d442c251fcd2a4778d291b
2021-04-13Improve isNfcEventAllowedGeorge Chang
Return when SE is not connected Bug: 185198557 Test: manual Change-Id: I0c90862585f311bc6695235e316023aeceb9df7a
2021-03-08Merge "Enable Async MTE in the SecureElement app." am: db02ce4656 am: ↵Evgenii Stepanov
8fc9e8c0c1 am: 171b624c02 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1621701 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ec60382f401c79f9958b9e7a42699e25dc29ff2
2021-03-08Merge "Enable Async MTE in the SecureElement app." am: db02ce4656 am: 8fc9e8c0c1Evgenii Stepanov
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1621701 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I39adcf32b767a7f264abe5a9a42155b158dce9f8
2021-03-08Merge "Enable Async MTE in the SecureElement app." am: db02ce4656Evgenii Stepanov
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1621701 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I02a3ede434b92aba530cf302ab1d1c683b08892e
2021-03-08Merge "Enable Async MTE in the SecureElement app."Evgenii Stepanov
2021-03-05Enable Async MTE in the SecureElement app.Evgenii Stepanov
Bug: 181603044 Test: none yet - this change does not affect non-MTE hardware Change-Id: I20d4d87e79995880cc5b1e764433fbf789b402e8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: aa1c765058 -s ↵Xin Li
ours am: 03f0e55a84 -s ours am skip reason: Change-Id Ibee0088b6c9ea0129d313fcf4a857949f376686b with SHA-1 8d99fea137 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17950160c8720d72477157699e58862ae45e016b
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SecureElement am: b4199f4d36 ↵Bob Badour
am: 1d85fdb576 am: da570f93f5 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1588198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b0b9a6546ba4c7bd09ff35f08be51a245f822d9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: aa1c765058 -s oursXin Li
am skip reason: Change-Id Ibee0088b6c9ea0129d313fcf4a857949f376686b with SHA-1 8d99fea137 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e6782c019c858931c3e400205158e5bfaaa73b8
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ibee0088b6c9ea0129d313fcf4a857949f376686b Change-Id: I6e876e142b7ba51765ba4fdcc8260fd44d918082
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SecureElement am: b4199f4d36 ↵Bob Badour
am: 1d85fdb576 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1588198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I869515d84b46868acfd88b04bb03820c6cf26a60
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SecureElement am: b4199f4d36Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1588198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0129c29353c6204f4eb11c236a6f61eaf2cad9bb
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SecureElementBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I3c1d16fbbe4f937980df58fc96f09f5918e8e326
2021-01-22Trigger broadcast intent when the secure element state changed am: ↵Jack Yu
34beade7cc am: 6560a1fdae am: 08862b70aa Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1533159 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6cfeddfdf454979485d7ecdd8a676b01a88ae5cf
2021-01-22Trigger broadcast intent when the secure element state changed am: ↵Jack Yu
34beade7cc am: 6560a1fdae Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1533159 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I699164bbe5236b5172159c2ab17eff5bfceeb25a
2021-01-22Trigger broadcast intent when the secure element state changed am: 34beade7ccJack Yu
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1533159 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iec09e885c614b4460d56da230811ece3ad833250
2021-01-18Trigger broadcast intent when the secure element state changedandroid-s-preview-1Jack Yu
Bug: 175850569 Test: check broadcast intent is triggered when the secure element state changed Change-Id: I7a9cf5153919b49e3493f0214ee7b11e4414843d
2020-11-23Mark ab/6881855 as merged am: 8e55a87895 am: 8d99fea137Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/13112919 Change-Id: I34075aa4a09f4bcc4ec1c47cb720167c4d994531
2020-11-23Mark ab/6881855 as merged am: 8e55a87895Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/13112919 Change-Id: Ibee0088b6c9ea0129d313fcf4a857949f376686b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I2be31ae9a01beaa20a6afde882b9c578eff8e85a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1522b8a146 -s ours am: ↵Xin Li
1e2b8cb180 -s ours am: f301747334 -s ours am skip reason: Change-Id I5c0e2ef4351f0152fd8fd45c8a6de7f7cd10e45c with SHA-1 f2aa93b087 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12796756 Change-Id: I99cf43555f1c6cd0a150bd396a051c219eaee9ba
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1522b8a146 -s ours am: ↵Xin Li
1e2b8cb180 -s ours am skip reason: Change-Id I5c0e2ef4351f0152fd8fd45c8a6de7f7cd10e45c with SHA-1 f2aa93b087 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12796756 Change-Id: Ieced49f1dd7cdcf9e51f24458e3f5c1dfa222149
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1522b8a146 -s oursXin Li
am skip reason: Change-Id I5c0e2ef4351f0152fd8fd45c8a6de7f7cd10e45c with SHA-1 f2aa93b087 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12796756 Change-Id: I7534a0fd8159e2aa1060357a76448c56b40d3e93
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I5c0e2ef4351f0152fd8fd45c8a6de7f7cd10e45c Change-Id: I0d58bda884e7850946768d8cc94bd5c4070393b7
2020-09-13[automerger skipped] Refresh terminal instances when switching between SS ↵Jack Yu
and DS am: a0108ddb86 am: d97725cd73 -s ours am skip reason: Change-Id I8bb13b43de6f17f0b5b82440708d90bf684ca7ec with SHA-1 a0108ddb86 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11675379 Change-Id: I95a07f3a0e1a65f68f084cbea7fa5b6ed5e672a9
2020-09-13[automerger skipped] Merge "Allow OpenLogicalChannel with null aid for ↵TreeHugger Robot
privilege apps" into rvc-dev am: da6daab1eb am: 8408f4984d -s ours am skip reason: Change-Id Icf7ee2b299154874f1bdd4b5b409c7df04eb831b with SHA-1 79a2fb5855 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11628925 Change-Id: Id2e44bab60b73327e245323830a81e9d5b9d3d0a
2020-09-13[automerger skipped] Deny the operation to select ISD-R aid am: 69dbe6f5de ↵Jack Yu
am: ab8c47531f -s ours am skip reason: Change-Id Id7dd6e3afcb88d97b7c62e8710ef16fbc35010f3 with SHA-1 69dbe6f5de is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11786959 Change-Id: Ida90aca1dd1ac61b2acc15e4e7b8fd4a3089b0d8
2020-09-13[automerger skipped] Fix ActivityNotFoundException am: b8b2823edd am: ↵Jack Yu
30407afa87 -s ours am skip reason: Change-Id I721549c68430bec4f777e560642864907c60f90f with SHA-1 b8b2823edd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11587869 Change-Id: I1d9c6d8e84ed5e2c28a5fd423bab8c1c2b2f6790
2020-09-11[automerger skipped] Merge Android R am: 8d017fe0b9 -s ours am: 424f9d48a6 ↵Xin Li
-s ours am: a8ac53c99a -s ours am: 675aed33ee -s ours am: 7d4af72f64 -s ours am skip reason: Change-Id I0c95c223bdf1983a328859775a77bde95d3c10bd with SHA-1 6a7763d5a2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1422318 Change-Id: I5915fe507e64562fff8cff7f9b0d13033bf6506d
2020-09-11[automerger skipped] Merge Android R am: 8d017fe0b9 -s ours am: 424f9d48a6 ↵Xin Li
-s ours am: a8ac53c99a -s ours am: 675aed33ee -s ours am skip reason: Change-Id I0c95c223bdf1983a328859775a77bde95d3c10bd with SHA-1 6a7763d5a2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1422318 Change-Id: I7817a7b2545c9414d378429cfe6a7e163324991a
2020-09-11[automerger skipped] Merge Android R am: 8d017fe0b9 -s ours am: 424f9d48a6 ↵Xin Li
-s ours am: a8ac53c99a -s ours am skip reason: Change-Id I0c95c223bdf1983a328859775a77bde95d3c10bd with SHA-1 6a7763d5a2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1422318 Change-Id: Ied120923504bcc5dff0bd359e7c7cd6379cf9829
2020-09-11[automerger skipped] Merge Android R am: 8d017fe0b9 -s ours am: 424f9d48a6 ↵Xin Li
-s ours am skip reason: Change-Id I0c95c223bdf1983a328859775a77bde95d3c10bd with SHA-1 6a7763d5a2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1422318 Change-Id: Ie7ced608f878ab64f3d20d0c5328d99f412f15a8
2020-09-11[automerger skipped] Merge Android R am: 8d017fe0b9 -s oursXin Li
am skip reason: Change-Id I0c95c223bdf1983a328859775a77bde95d3c10bd with SHA-1 6a7763d5a2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1422318 Change-Id: I6408cece934f74ffa55606353f699034cdc570de
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I0c95c223bdf1983a328859775a77bde95d3c10bd Change-Id: I21f8a07ee72dd25dff914c1a89765444495715a7
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6a7763d5a2 -s ours am: 61639de9ce -s ours am: 941212ccf1 -s ours am: a2f4da5161 -s ours am skip reason: Change-Id Icd7c55502f1b44635816faa08ffb03df5b711a75 with SHA-1 028ac8c3ca is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12470251 Change-Id: I5ded0a706ada418bfe1b1dac2310d503c1fe0cc0
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6a7763d5a2 -s ours am: 61639de9ce -s ours am: 941212ccf1 -s ours am skip reason: Change-Id Icd7c55502f1b44635816faa08ffb03df5b711a75 with SHA-1 028ac8c3ca is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12470251 Change-Id: I37e119a6fc396c8bf6465a980b3f7b9174a2160b
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6a7763d5a2 -s ours am: 61639de9ce -s ours am skip reason: Change-Id Icd7c55502f1b44635816faa08ffb03df5b711a75 with SHA-1 028ac8c3ca is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12470251 Change-Id: Ic68e8046490f63adee80b35f951fc41f23bcc9d2
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6a7763d5a2 -s ours am skip reason: Change-Id Icd7c55502f1b44635816faa08ffb03df5b711a75 with SHA-1 028ac8c3ca is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/12470251 Change-Id: Ibdb6a2fa0ad4404583a64b1bb6beacb2e8bf9e06
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Icd7c55502f1b44635816faa08ffb03df5b711a75 Change-Id: I0c95c223bdf1983a328859775a77bde95d3c10bd
2020-08-07apps/SecureElement - Update language to comply with Android's inclusive ↵Raman Tenneti
language guidance. See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: PresubmitVerify Change-Id: Ia0339391a69c9c9f7c04b99c26485b6c6955ba3d
2020-06-15Code sync to aosp branch am: a05bb069e2 am: 406aec1da7 am: 028ac8c3ca am: ↵Jack Yu
f2aa93b087 am: 3449d3b292 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1331446 Change-Id: I1bc29b491b5570958cb8e968461703357a05ebc0
2020-06-15Code sync to aosp branch am: a05bb069e2 am: 406aec1da7 am: 028ac8c3ca am: ↵Jack Yu
f2aa93b087 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1331446 Change-Id: I064f2f9a51ee2b5dd1a3953dc4b35d8ab4953fcb
2020-06-15Code sync to aosp branch am: a05bb069e2 am: 406aec1da7 am: 028ac8c3caJack Yu
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1331446 Change-Id: I5c0e2ef4351f0152fd8fd45c8a6de7f7cd10e45c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 23:49:53 +0000