Do not try to initialze the access control enforcer in NFC API am: 8ca26b9e6c am: 8e8c2e3186 am: 1371b44d5bandroid-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-dev

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1688294

Change-Id: I9307fa05a2ad6d7ac8c04d713645cd035d611486

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);