Snap for 7336869 from d052b0b1d1abda205590db2e7db08b377a8e0cb0 to sc-release
Change-Id: I9404d8db3a65ed0d7edc32eacb908dea55656900
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 @@
// 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);
