1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java
index 4894aec..d86a52d 100755
--- a/src/com/android/se/Terminal.java
+++ b/src/com/android/se/Terminal.java
@@ -575,7 +575,7 @@ public class Terminal {
                     packageName);
             try {
                 channelAccess = setUpChannelAccess(aid, packageName, pid, false);
-            } catch (MissingResourceException e) {
+            } catch (MissingResourceException | UnsupportedOperationException e) {
                 return null;
             }
         }
@@ -838,6 +838,10 @@ public class Terminal {
             }
             if (isBasicChannel) {
                 throw new MissingResourceException("openBasicChannel is not allowed.", "", "");
+            } else if (aid == null) {
+                // openLogicalChannel with null aid is only allowed for privilege applications
+                throw new UnsupportedOperationException(
+                        "null aid is not accepted in UICC terminal.");
             }
         }