summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-12Refresh terminal instances when switching between SS and DS am: a0108ddb86android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100Jack Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11675379 Change-Id: Id5767e7cb2045a1e6ca37c40db16be3668531359
2020-06-11Refresh terminal instances when switching between SS and DSandroid11-devJack Yu
Listen to CARRIER_CONFIG_CHANGED and reinitialize UICC terminals. Bug: 152008670 Test: adb shell dumpsys secure_element Merged-In: I8bb13b43de6f17f0b5b82440708d90bf684ca7ec Change-Id: I8bb13b43de6f17f0b5b82440708d90bf684ca7ec
2020-06-10Merge "Allow OpenLogicalChannel with null aid for privilege apps" into ↵TreeHugger Robot
rvc-dev am: da6daab1eb Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11628925 Change-Id: Ib1920e2f35ad96f34c6105a07067d25e0a92c025
2020-06-10Merge "Allow OpenLogicalChannel with null aid for privilege apps" into rvc-devTreeHugger Robot
2020-06-08Deny the operation to select ISD-R aid am: 69dbe6f5deJack Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11786959 Change-Id: Ibe80571215c26b9c515f4a57222d8fd4d6ce3377
2020-06-08Deny the operation to select ISD-R aidJack Yu
Do not directly provide privilege access to carrier privilege apps to select ISD-R aid. Fallback to GP rules checking. Bug: 157968163 Test: select ISD-R aid is not directly allowed for carrier privilege apps Merged-In: Id7dd6e3afcb88d97b7c62e8710ef16fbc35010f3 Change-Id: Id7dd6e3afcb88d97b7c62e8710ef16fbc35010f3
2020-06-03Allow OpenLogicalChannel with null aid for privilege appsJack Yu
Do not return null directly when application try to openLogicalChannel with null aid. Check if it is privilege application first. Bug: 157349625 Test: openLogicalChannel with null aid Merged-In: Icf7ee2b299154874f1bdd4b5b409c7df04eb831b Change-Id: Icf7ee2b299154874f1bdd4b5b409c7df04eb831b
2020-05-25Fix ActivityNotFoundException am: b8b2823eddJack Yu
Change-Id: I512ef89408ac418e0cd26bf7041f1c0df188d30d
2020-05-25Fix ActivityNotFoundExceptionJack Yu
In Android 11, we need an additional permission to access all other installed packages Bug: 157119957 Test: build pass Merged-In: I721549c68430bec4f777e560642864907c60f90f Change-Id: I721549c68430bec4f777e560642864907c60f90f
2020-04-22Correct carrier privilege checkingJack Yu
Bug: 154094471 Test: check carrier privilege Merged-In: Id1a3fdb669c8e85aafcdb9623ec30b098f6c36c2 Change-Id: Id1a3fdb669c8e85aafcdb9623ec30b098f6c36c2
2020-04-22OpenBasicChannel with UICC should not be allowed for non-privilege appsJack Yu
Throw exception in setUpChannelAccess if this is not a privilege app. Bug: 153934978 Test: atest CtsOmapiTestCases Merged-In: Id39bcad679e856370b985bb77ca77aaadc84c7a0 Change-Id: Id39bcad679e856370b985bb77ca77aaadc84c7a0
2020-04-14Fix redundant codeflow in openLogicalChannel with UICC terminalJack Yu
When setup channel access for UICC terminal, carrier privileges checking add unnecessary rules loading. Bug: 152060727 Bug: 153832909 Test: atest CtsOmapiTestCases Merged-In: Ia3230a7f0165b9233196a698d9bfd0e243fa0db6 Change-Id: Ia3230a7f0165b9233196a698d9bfd0e243fa0db6
2020-03-31Do not overwrite mFullAccess settingJack Yu
Bug: 152817207 Test: mFullAccess could be modified in debug build by property Merged-In: I0fe3abda539d504bcf2ff314fc4bc5fa7419f614 Change-Id: I0fe3abda539d504bcf2ff314fc4bc5fa7419f614
2020-03-31Allow privilege app access to open channelAnil Hiranniah
Allow privilege app access to open channel even if AccessControlEnforcer is not available. Throw exception only for non privileged access. Bug: 149632580 Test: OpenBasicChannel from Privileged/Non privileged app Merged-In: Ie188d397f6bf641923d010ad3a9d00d21bc9351b Change-Id: Ie188d397f6bf641923d010ad3a9d00d21bc9351b
2020-03-23Include channel operation in synchronized area am: c3f935b630Jack Yu
Change-Id: I9873ffc144c6a3477e4e51306ff64a5a9d7ce634
2020-03-16Change naming to be more specificJack Yu
Change SECURE_ELEMENT_PRIVILEGED to SECURE_ELEMENT_PRIVILEGED_OPERATION. Bug: 150877612 Test: build pass Merged-In: I5c0d557f9ac43b64f2113de6c4a46f92e99b7c27 Change-Id: I5c0d557f9ac43b64f2113de6c4a46f92e99b7c27
2020-02-18Update OWNERS file am: 9f43436747 am: 397769dff6 am: c74cb81a3cGeorge Chang
Change-Id: Ie60354f0426a31e586081315214730be34f3a022
2020-02-18Update OWNERS file am: 9f43436747 am: 397769dff6George Chang
Change-Id: I18655424661053a43efc59e2c7298c5051477c28
2020-02-18Update OWNERS file am: 9f43436747George Chang
Change-Id: I9d3834439a1b0d6a250efdadd36a201f57f14ff8
2020-02-18Update OWNERS fileGeorge Chang
Test: None Change-Id: Id2e5629b687ff92d6cf38e8b8ddb4a3b05a89d20
2020-02-12Include channel operation in synchronized area am: 38da55f2ec am: 96b22f4f87 ↵Automerger Merge Worker
am: 235b4688ef Change-Id: Id9083df806b6cceaf0f339bf998971bb90afd42c
2020-02-12Include channel operation in synchronized area am: 38da55f2ec am: 96b22f4f87Automerger Merge Worker
Change-Id: Ia88bac4a5df1a0860d44243337fbad69884d6bd6
2020-02-12Include channel operation in synchronized area am: 38da55f2ecAutomerger Merge Worker
Change-Id: I8acbc07c7305aca59cea540fef5fe63b3cd21f62
2020-02-06Include channel operation in synchronized areaJack Yu
When application try to stress OMAPI by continuously open/close channels with multi-thread, there is possibility channel management is incorrect and result to no response. Bug: 148892905 Test: OMAPI works normal after multi-thread stress tests Change-Id: I530015ff20ed143a129024d6385fae9392a00a99
2020-02-06Include channel operation in synchronized areaJack Yu
When application try to stress OMAPI by continuously open/close channels with multi-thread, there is possibility channel management is incorrect and result to no response. Bug: 148892905 Test: OMAPI works normal after multi-thread stress tests Change-Id: I530015ff20ed143a129024d6385fae9392a00a99
2020-01-31Merge "Migrate to SecureElementStatsLog from StatsLog"TreeHugger Robot
2020-01-24Migrate to SecureElementStatsLog from StatsLogMuhammad Qureshi
As part of statsd becoming a Mainline module in R, autogenerated StatsLog.write() calls are going away and replaced by *StatsLog.java that is autogenerated for each module. This CL adds autogenerated SecureElementStatsLog and replaces usages of StatsLog with SecureElementStatsLog. Bug: 145952197 Test: m SecureElement Change-Id: Ided6c27ba2be86152949dcbf430bcc3140a62b58
2020-01-24Merge "Add support for secure_element HAL 1.2" am: 138fac9fd1 am: 463b696619 ↵Automerger Merge Worker
am: 5199b8777f Change-Id: I825ebd3f5664543b774fe07090ab336e097df572
2020-01-23Merge "Add support for secure_element HAL 1.2" am: 138fac9fd1 am: 463b696619Automerger Merge Worker
Change-Id: I02c1485e57b0555352d0f53840eaf525828af819
2020-01-22Merge "Add support for secure_element HAL 1.2"Jack Yu
am: 138fac9fd1 Change-Id: I71b2faf5fbb8ad26b9aed7cbfd93691c3b2bfd37
2020-01-23Merge "Add support for secure_element HAL 1.2"android-r-preview-1Treehugger Robot
2020-01-21Add support for secure_element HAL 1.2Jack Yu
Test: manual Bug: 142495673 Change-Id: I1338a2a11cc60fa50b1c8dd8e75022af9ea1b0a1
2020-01-18Unblock some operations for privilege applications am: 50f1c9584a am: ↵Automerger Merge Worker
edcdd54ffa am: 4a7a362a87 Change-Id: I7b75545e13cfe9822b3065e99d98a8d2e41f1d2d
2020-01-18Add Carrier Privilege support am: 2b58f07680 am: aa39f5e4a1 am: ad7ee467d5Automerger Merge Worker
Change-Id: I7e2079fb7179ee76d1580d59a9b8e794aa426bd9
2020-01-18Unblock some operations for privilege applications am: 50f1c9584a am: edcdd54ffaAutomerger Merge Worker
Change-Id: I6ac56d6ab996301848f2f7727d14b868057fbacb
2020-01-18Add Carrier Privilege support am: 2b58f07680 am: aa39f5e4a1Automerger Merge Worker
Change-Id: Ifa56c3fba9cf26c0d92e58e62fe83d952b851394
2020-01-17Unblock some operations for privilege applicationsJack Yu
am: 50f1c9584a Change-Id: I3b4e662840215ed47faca6799db7cf00354027f9
2020-01-17Add Carrier Privilege supportJack Yu
am: 2b58f07680 Change-Id: If6e9e79938fd43aad3351dba2cef0386ac737bb4
2020-01-16[automerger skipped] DO NOT MERGE - Empty merge ↵Automerger Merge Worker
qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: b7689878f1 am: 0260a8c34f -s ours am skip reason: subject contains skip directive Change-Id: Ic8534e1d34161b6067ba10f44df6fac7a95355cd
2020-01-16DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) ↵Automerger Merge Worker
into stage-aosp-master am: b7689878f1 Change-Id: I81db1cdd1990c95b00ad4fd670f53563b381cde5
2020-01-15DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) ↵Xin Li
into stage-aosp-master Bug: 146167222 Change-Id: I7ab5eb1c25080f091ba830e610c6e9b9cf8de890
2020-01-13Provide privilege access to system application am: ccf7c818c4 am: 2788650397 ↵Automerger Merge Worker
am: a6ce6978de Change-Id: I443691e550e0f7ff63fee2a42b66e3eef0cca866
2020-01-13Provide privilege access to system application am: ccf7c818c4 am: 2788650397Automerger Merge Worker
Change-Id: I3172721c00a94334e5d16832edcf11c23ecf506e
2020-01-12Provide privilege access to system applicationJack Yu
am: ccf7c818c4 Change-Id: I9a68655378bad1177c4ec5ff5efe542e24611867
2020-01-08Unblock some operations for privilege applicationsJack Yu
When applications with privilege permission or carrier privilege, allow basic channel access and select operation in an opened channel. Bug: 139701995 Test: build pass Change-Id: I823202b9eadf012cfdf89bde5678c01bc8f77314
2020-01-08Add Carrier Privilege supportJack Yu
Support Carrier Privilege rules. Bug: 139701995 Test: Check carrier privilege rules could be parsed correctly Change-Id: I2838d335f9993eb7e50323773ed52579f53766a3
2020-01-08Provide privilege access to system applicationJack Yu
Provide access to eSE when system application granted privilege permission. Bug: 141963658 Test: Manual Change-Id: I5f00ee71c4d42ea612abeeeb637248337af3c1f6
2019-12-13Merge "Fix bug transmit APDU status word 6CXX follow by 61XX case." am: ↵Automerger Merge Worker
679fd5352c am: c036e944f0 am: 50365a153e Change-Id: Ic19fc9e1146897aa451431bb8b63faae05307baf
2019-12-13Merge "Fix bug transmit APDU status word 6CXX follow by 61XX case." am: ↵Automerger Merge Worker
679fd5352c am: c036e944f0 Change-Id: Ia161f505e32e470d41c8590aa5e3eb96f85be4ba
2019-12-13Merge "Fix bug transmit APDU status word 6CXX follow by 61XX case."George Chang
am: 679fd5352c Change-Id: I57b38482be70fb43f8cbed43d42e5949c8cb2d23