From c20034218208f157564b5450fa981b8caf5efc19 Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Mon, 2 Apr 2018 17:52:50 -0700 Subject: [PATCH 1/2] Add defaultSysCodePowerState in types.hal in NFC 1.1 Test: Nfc Enable/Disable; test if config is read in logcat Bug: 77496460 Change-Id: I13e21ba18c03c3c7b9eff3aa67e843e7f063b233 --- nfc/1.1/types.hal | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nfc/1.1/types.hal b/nfc/1.1/types.hal index 469e878ddb..e9ffd1611e 100644 --- a/nfc/1.1/types.hal +++ b/nfc/1.1/types.hal @@ -77,6 +77,9 @@ struct NfcConfig { /** Default system code route. 0x00 if there aren't any. Refer NCI spec */ 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 * been configured. From b0cd96080fdb730848217a6076695078675532a6 Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Mon, 2 Apr 2018 17:53:51 -0700 Subject: [PATCH 2/2] Changes in current.txt as per NFC 1.1 changes Test: compiles without errors Bug: 77496460 Change-Id: Ic0d45b64ac6a06cfa1405842464e69ebdebfe1ca --- current.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/current.txt b/current.txt index 06c94d93f8..8d1d6e6baa 100644 --- a/current.txt +++ b/current.txt @@ -340,7 +340,7 @@ b8c7ed58aa8740361e63d0ce9e7c94227572a629f356958840b34809d2393a7c android.hardwar e808a6f61cd7b47887c599d8843e67a2dcbf4ec5aadd5d22fdce93020070ef1b android.hardware.neuralnetworks@1.1::types 8d3d86da0bfa4bf070970d8303c659f67f35d670c287d45a3f542e4fedadd578 android.hardware.nfc@1.1::INfc 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 7899b9305587b2d5cd74a3cc87e9090f58bf4ae74256ce3ee36e7ec011822840 android.hardware.power@1.2::types ab132c990a62f0aca35871c092c22fb9c85d478e22124ef6a4d0a2302da76a9f android.hardware.radio@1.2::IRadio