diff options
author | Jack Yu <jackcwyu@google.com> | 2021-05-04 11:27:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-04 11:27:08 +0000 |
commit | f100925ad7f7b7f3b19d38c262b048fdd667e7ca (patch) | |
tree | 7a6ccf14e7ecc9cf63c6edeb638232bb09879ed5 | |
parent | 85e936cbb704b3a2af33c9508b9af35d1ac8b26f (diff) | |
parent | d052b0b1d1abda205590db2e7db08b377a8e0cb0 (diff) | |
download | SecureElement-f100925ad7f7b7f3b19d38c262b048fdd667e7ca.tar.gz |
Do not try to initialze the access control enforcer in NFC API am: 8ca26b9e6c am: 8e8c2e3186 am: 1371b44d5b am: d052b0b1d1android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1688294
Change-Id: I2923d9a19e673a58f6ae95edf14aef8e0d3daa6f
-rw-r--r-- | src/com/android/se/Terminal.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java index 139390b..d97dd2f 100644 --- a/src/com/android/se/Terminal.java +++ b/src/com/android/se/Terminal.java @@ -688,18 +688,10 @@ public class Terminal { // Return if not connected return null; } - // Attempt to initialize the access control enforcer if it failed in the previous attempt - // due to a kind of temporary failure or no rule was found. + // Return if the access control enforcer failed in previous attempt or no rule was found. if (mAccessControlEnforcer == null || mAccessControlEnforcer.isNoRuleFound()) { - try { - initializeAccessControl(); - Log.i(mTag, "AccessControlEnforcer initialized"); - // Just finished to initialize the access control enforcer. - // It is too much to check the refresh tag in this case. - } catch (Exception e) { - Log.i(mTag, "isNfcEventAllowed Exception: " + e.getMessage()); - return null; - } + Log.i(mTag, "isNfcEventAllowed: No access rules for checking."); + return null; } mAccessControlEnforcer.setPackageManager(packageManager); |