summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-11-26 13:50:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-26 13:50:43 +0000
commit13a74e1f60876f9508ba29fcaeecc6ed10d5d058 (patch)
treeefc67b02206da1aea6c3150d8e42f8206b35f0c7
parenteec8e24ef301d59365a7af4f9390a6aedf6f9690 (diff)
parent67bf96eac96a88ccdf4aeaa92beaf2a35af8c08f (diff)
Merge "Fix work profile applications do not receive event transaction data" am: 67bf96eac9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838431 Change-Id: Ib6e5532e0ab81d6ae17f46504f33602c999c743d
-rw-r--r--omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl2
-rw-r--r--omapi/aidl/android/se/omapi/ISecureElementService.aidl4
2 files changed, 3 insertions, 3 deletions
diff --git a/omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl b/omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl
index ae6346278691..0c8e431d18a1 100644
--- a/omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl
+++ b/omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl
@@ -41,5 +41,5 @@ package android.se.omapi;
interface ISecureElementService {
String[] getReaders();
android.se.omapi.ISecureElementReader getReader(in String reader);
- boolean[] isNFCEventAllowed(in String reader, in byte[] aid, in String[] packageNames);
+ boolean[] isNfcEventAllowed(in String reader, in byte[] aid, in String[] packageNames, in int userId);
}
diff --git a/omapi/aidl/android/se/omapi/ISecureElementService.aidl b/omapi/aidl/android/se/omapi/ISecureElementService.aidl
index 61ae4816de82..13707ec22b5c 100644
--- a/omapi/aidl/android/se/omapi/ISecureElementService.aidl
+++ b/omapi/aidl/android/se/omapi/ISecureElementService.aidl
@@ -52,7 +52,7 @@ interface ISecureElementService {
* Checks if the application defined by the package name is allowed to
* receive NFC transaction events for the defined AID.
*/
- boolean[] isNFCEventAllowed(in String reader, in byte[] aid,
- in String[] packageNames);
+ boolean[] isNfcEventAllowed(in String reader, in byte[] aid,
+ in String[] packageNames, in int userId);
}