commit f7e6fb0f26615e2aed579354849e57c5ac525402
author Ruchi Kandoi <kandoiruchi@google.com> Tue Apr 03 14:56:12 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 03 14:56:12 2018 -0700
tree d267a092ce4dd5e5caf3ad180d8820934b1434e4
parent e01f93120468768448d0c22bedcc1b818ea3d9e0
parent 171dce720d8b161f7a6eb030c36d68d54dfa0661

Merge changes from topic "nfc1.1" into pi-dev am: eac7714719
am: 171dce720d

Change-Id: Ibca136a5ac4bb427fc123dbdf86f2c5151365e0b

current.txt

diff --git a/current.txt b/current.txt
index eb6401e..5aa6259 100644
--- a/current.txt
+++ b/current.txt
@@ -340,7 +340,7 @@
 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

nfc/1.1/types.hal

diff --git a/nfc/1.1/types.hal b/nfc/1.1/types.hal
index 469e878..e9ffd16 100644
--- a/nfc/1.1/types.hal
+++ b/nfc/1.1/types.hal
@@ -77,6 +77,9 @@
     /** 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.