SecureElement: Improve isNfcEventAllowed

Return when SE is not connected

Bug: 185198557
Test: manual
Change-Id: I0c90862585f311bc6695235e316023aeceb9df7a
(cherry picked from commit cba6328078700b0d3adc92c8a95da9337718597a)

1 files changed, 5 insertions, 0 deletions

diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java
index 54dc256..d8033ed 100644
--- a/src/com/android/se/Terminal.java
+++ b/src/com/android/se/Terminal.java
@@ -670,11 +670,16 @@ public class Terminal {
      */
     public boolean[] isNfcEventAllowed(PackageManager packageManager, byte[] aid,
             String[] packageNames) {
+        if (!mIsConnected) {
+            // 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.
         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) {