commit 885f55e85f3de18db6b2243bbdcbf9699b4299a7
author Jack Yu <jackcwyu@google.com> Fri Dec 03 02:08:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 03 02:08:16 2021 +0000
tree f2d13bf6aa1592b89e3b4ed3bbbc1cc28ced9449
parent 7cd489a31e1e64d72a38b066a620c0738f6be424
parent a729797451c1fcb1f8f7c19de7cf4316284b6f7e

Fix managedProfileUnlock_stopped am: a729797451

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

Change-Id: Icbe690fb17c113dde7f6f056c9750007667b7a55

src/com/android/se/SecureElementService.java

diff --git a/src/com/android/se/SecureElementService.java b/src/com/android/se/SecureElementService.java
index 9183649..b03a462 100644
--- a/src/com/android/se/SecureElementService.java
+++ b/src/com/android/se/SecureElementService.java
@@ -134,9 +134,16 @@
                 throw new IllegalArgumentException("package names not specified");
             }
             Terminal terminal = getTerminal(reader);
-            return terminal.isNfcEventAllowed(
-                    createContextAsUser(UserHandle.of(userId), /*flags=*/0)
-                    .getPackageManager(), aid, packageNames);
+            Context context;
+            try {
+                context = createContextAsUser(UserHandle.of(userId), /*flags=*/0);
+            } catch (IllegalStateException e) {
+                context = null;
+                Log.d(mTag, "fail to call createContextAsUser for userId:" + userId);
+            }
+            return context == null ? null : terminal.isNfcEventAllowed(
+                    context.getPackageManager(), aid, packageNames);
+
         }
 
         @Override