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

Commit 8e8fa8b2 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nfc_main_merge" into aosp-main-future 

* changes:
  Eliminate boilder plate code for recovering service in NfcAdapter
  Add Test method to inject HCE data
  [framework] Add a flag for nfc persist log.
parents 1b1652d4 d6dc4967

nfc/java/android/nfc/INfcAdapter.aidl

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ interface INfcAdapter 


    void notifyPollingLoop(in PollingFrame frame);

    void notifyHceDeactivated();

    void notifyTestHceData(in int technology, in byte[] data);

    int sendVendorNciMessage(int mt, int gid, int oid, in byte[] payload);

    void registerVendorExtensionCallback(in INfcVendorNciCallback callbacks);

    void unregisterVendorExtensionCallback(in INfcVendorNciCallback callbacks);

nfc/java/android/nfc/NfcAdapter.java

+93 −372

File changed.

Preview size limit exceeded, changes collapsed.

nfc/java/android/nfc/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -110,3 +110,11 @@ flag { 
    bug: "321311407"

}



flag {

    name: "nfc_persist_log"

    is_exported: true

    namespace: "nfc"

    description: "Enable NFC persistent log support"

    bug: "321310044"

}