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

Commit f7e6fb0f authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Merge changes from topic "nfc1.1" into pi-dev am: eac77147 

am: 171dce72

Change-Id: Ibca136a5ac4bb427fc123dbdf86f2c5151365e0b
parents e01f9312 171dce72

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -340,7 +340,7 @@ b8c7ed58aa8740361e63d0ce9e7c94227572a629f356958840b34809d2393a7c android.hardwar 
e808a6f61cd7b47887c599d8843e67a2dcbf4ec5aadd5d22fdce93020070ef1b android.hardware.neuralnetworks@1.1::types

e808a6f61cd7b47887c599d8843e67a2dcbf4ec5aadd5d22fdce93020070ef1b android.hardware.neuralnetworks@1.1::types

8d3d86da0bfa4bf070970d8303c659f67f35d670c287d45a3f542e4fedadd578 android.hardware.nfc@1.1::INfc

8d3d86da0bfa4bf070970d8303c659f67f35d670c287d45a3f542e4fedadd578 android.hardware.nfc@1.1::INfc

e85f566698d2a2c28100e264fcf2c691a066756ddf8dd341d009ff50cfe10614 android.hardware.nfc@1.1::INfcClientCallback

e85f566698d2a2c28100e264fcf2c691a066756ddf8dd341d009ff50cfe10614 android.hardware.nfc@1.1::INfcClientCallback

2b8f6165b3d350485eb89eb6e931cf876688cde9155f7b31a8d8fe7abdfe5b95 android.hardware.nfc@1.1::types

5e278fcaa3287d397d8eebe1c22aaa28150f5caae1cf9381cd6dc32cb37899c5 android.hardware.nfc@1.1::types

163e115e833fc1d77cdd4a8cf0c833bb8b8d74fe35c880fe693101d17774926f android.hardware.power@1.2::IPower

163e115e833fc1d77cdd4a8cf0c833bb8b8d74fe35c880fe693101d17774926f android.hardware.power@1.2::IPower

7899b9305587b2d5cd74a3cc87e9090f58bf4ae74256ce3ee36e7ec011822840 android.hardware.power@1.2::types

7899b9305587b2d5cd74a3cc87e9090f58bf4ae74256ce3ee36e7ec011822840 android.hardware.power@1.2::types

ab132c990a62f0aca35871c092c22fb9c85d478e22124ef6a4d0a2302da76a9f android.hardware.radio@1.2::IRadio

ab132c990a62f0aca35871c092c22fb9c85d478e22124ef6a4d0a2302da76a9f android.hardware.radio@1.2::IRadio

nfc/1.1/types.hal

+3 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,9 @@ struct NfcConfig { 
    /** Default system code route. 0x00 if there aren't any. Refer NCI spec */

    /** Default system code route. 0x00 if there aren't any. Refer NCI spec */

    uint8_t defaultSystemCodeRoute;

    uint8_t defaultSystemCodeRoute;





    /** Default power state for system code route. 0x00 if there aren't any. Refer NCI spec */

    uint8_t defaultSystemCodePowerState;



    /**

    /**

     * Default route for all remaining protocols and technology which haven't

     * Default route for all remaining protocols and technology which haven't

     * been configured.

     * been configured.