diff options
| author | Jack Yu <jackcwyu@google.com> | 2021-12-03 02:55:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-03 02:55:23 +0000 |
| commit | 8061c56bacd1c5e117b5d254b056a00b84789fe3 (patch) | |
| tree | f2d13bf6aa1592b89e3b4ed3bbbc1cc28ced9449 | |
| parent | 2d5bd5be7794eb978573ca46d8ae7377f5b31276 (diff) | |
| parent | 2d174cce357c38589f37696fb14b63b9b24fab45 (diff) | |
| download | SecureElement-8061c56bacd1c5e117b5d254b056a00b84789fe3.tar.gz | |
Fix managedProfileUnlock_stopped am: a729797451 am: 885f55e85f am: a17d11d776 am: 2d174cce35
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1909070
Change-Id: Ife6e30aa9283f81fd301950b464341f6366e6741
| -rw-r--r-- | src/com/android/se/SecureElementService.java | 13 |
1 files changed, 10 insertions, 3 deletions
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 @@ public final class SecureElementService extends Service { 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 |