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

Commit 3935a3fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "nfc_aosp_main_merge", "nfc_aosp_main_merge_stage2" into main 

* changes:
  Use parameterized test to disable test for devices without NFC
  Add VSR min API level
  Add VTS test for NFC observe mode
  [Hal] Add request/release control event in aidl interface.
parents fcd1963a a667849e

compatibility_matrices/compatibility_matrix.202504.xml

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
    </hal>

    <hal format="aidl" updatable-via-apex="true">

        <name>android.hardware.nfc</name>

        <version>1-2</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/INfc.aidl

+1 −0
Original line number Diff line number Diff line
@@ -44,4 +44,5 @@ interface INfc { 
  int write(in byte[] data);

  void setEnableVerboseLogging(in boolean enable);

  boolean isVerboseLoggingEnabled();

  android.hardware.nfc.NfcStatus controlGranted();

}

nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/NfcEvent.aidl

+2 −0
Original line number Diff line number Diff line
@@ -40,4 +40,6 @@ enum NfcEvent { 
  PRE_DISCOVER_CPLT = 3,

  HCI_NETWORK_RESET = 4,

  ERROR = 5,

  REQUEST_CONTROL = 6,

  RELEASE_CONTROL = 7,

}

nfc/aidl/android/hardware/nfc/INfc.aidl

+9 −0
Original line number Diff line number Diff line
@@ -140,4 +140,13 @@ interface INfc { 
     * @return true if verbose logging flag value is enabled, false if disabled.

     */

    boolean isVerboseLoggingEnabled();



    /**

     * Requests control of NFCC to libnfc-nci.

     * If an API request is sent when the framework has no control of NFCC, the request will be

     * queued until the control is released from HAL.

     * The control will be taken out of the framework for at most 2 seconds.

     * @return NfcStatus::OK on success and NfcStatus::FAILED on error.

     */

    NfcStatus controlGranted();

}

nfc/aidl/android/hardware/nfc/NfcEvent.aidl

+10 −0
Original line number Diff line number Diff line
@@ -50,4 +50,14 @@ enum NfcEvent { 
     * Error event to notify upper layer when there's an unknown error.

     */

    ERROR = 5,

    /**

     * Request control event to notify upper layer when HAL

     * request control of NFCC to libnfc-nci

     */

    REQUEST_CONTROL = 6,

    /**

     * Release control event to notify upper layer when HAL

     * release control of NFCC to libnfc-nci.

     */

    RELEASE_CONTROL = 7,

}