1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/se/Channel.java b/src/com/android/se/Channel.java
index f9e073e..4fbb2a0 100644
--- a/src/com/android/se/Channel.java
+++ b/src/com/android/se/Channel.java
@@ -240,8 +240,12 @@ public class Channel implements IBinder.DeathRecipient {
             // if not an exception is thrown
             mTerminal.getAccessControlEnforcer().checkCommand(this, command);
         } else {
-            throw new SecurityException("Access Controller not set for Terminal: "
-                    + mTerminal.getName());
+            // Allow access to Privileged App even if Access Control Enforcer is
+            // not initialized
+            if (ChannelAccess.ACCESS.ALLOWED != mChannelAccess.getPrivilegeAccess()) {
+                throw new SecurityException("Access Controller not set for Terminal: "
+                        + mTerminal.getName());
+            }
         }
     }