Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 981436f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix work profile applications do not receive event transaction data"... 

Merge "Fix work profile applications do not receive event transaction data" am: 67bf96ea am: 13a74e1f am: 25adfeb8 am: 4402bf3f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838431

Change-Id: I7ebab87cbeea60d92acd5775e2d7adf27c8374ff
parents 7be13f50 4402bf3f

omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

omapi/aidl/android/se/omapi/ISecureElementService.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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);



}