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

Commit 4402bf3f 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

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

Change-Id: I10cf146143047197b7e0fbef5d3e9549bf86c56f
parents b00e0e0d 25adfeb8

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);



}