diff options
| author | Jack Yu <jackcwyu@google.com> | 2021-12-03 02:24:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-03 02:24:40 +0000 |
| commit | a17d11d7764570adb5ac35e868ee6e087bc1c255 (patch) | |
| tree | f2d13bf6aa1592b89e3b4ed3bbbc1cc28ced9449 | |
| parent | de2032091accc17f4e2f8b5f4e81c96c671160ce (diff) | |
| parent | 885f55e85f3de18db6b2243bbdcbf9699b4299a7 (diff) | |
| download | SecureElement-a17d11d7764570adb5ac35e868ee6e087bc1c255.tar.gz | |
Fix managedProfileUnlock_stopped am: a729797451 am: 885f55e85f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1909070
Change-Id: I3570df5e664329394088aa64032e37f587bbf452
| -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 |