summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Yu <jackcwyu@google.com>2021-11-26 14:32:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-26 14:32:32 +0000
commited1ee7f2af8876ca17333548c5b7aac1e1c9092d (patch)
treebb7bb206d53633638a0972be7c1f1adcedc22a29
parent945ad8e253c8783f6fa18cf022c86faaede85074 (diff)
parent6cc34d6d2b4f3750262add123ab0c0aefba80eeb (diff)
downloadSecureElement-ed1ee7f2af8876ca17333548c5b7aac1e1c9092d.tar.gz
Get packageManager based on current user am: b48706211e am: bcb7af2208 am: 31c6caa83b am: 6cc34d6d2b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1829974 Change-Id: I723ebfb2b532c3118a2ff676d2dd3ca2fcd22041
-rw-r--r--src/com/android/se/SecureElementService.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/se/SecureElementService.java b/src/com/android/se/SecureElementService.java
index 2742fb4..fb2e771 100644
--- a/src/com/android/se/SecureElementService.java
+++ b/src/com/android/se/SecureElementService.java
@@ -22,6 +22,7 @@
package com.android.se;
+import android.app.ActivityManager;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -34,6 +35,7 @@ import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceSpecificException;
+import android.os.UserHandle;
import android.se.omapi.ISecureElementChannel;
import android.se.omapi.ISecureElementListener;
import android.se.omapi.ISecureElementReader;
@@ -133,7 +135,10 @@ public final class SecureElementService extends Service {
throw new IllegalArgumentException("package names not specified");
}
Terminal terminal = getTerminal(reader);
- return terminal.isNfcEventAllowed(getPackageManager(), aid, packageNames);
+ UserHandle currentUser = new UserHandle(ActivityManager.getCurrentUser());
+ return terminal.isNfcEventAllowed(
+ createContextAsUser(currentUser, /*flags=*/0).getPackageManager(),
+ aid, packageNames);
}
@Override