| commit | 20cbb3e57eb3f478f4f04f26f78df287ccd91b28 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 15 17:26:23 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 15 17:26:23 2024 +0000 |
| tree | 79b0e32be6fa9794310f7dd7e8b897b15fbbae28 | |
| parent | f17e304cd0e9f3fdd1f4b029a696f58b526c4b46 [diff] | |
| parent | f5dcb1fe38665405c80abc62328b59b3047ae1af [diff] |
Merge "Adding protocol for chinese Id in ProtocolDiscoveryConfig AIDL" into main am: f5dcb1fe38 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3345140 Change-Id: I8dbffb08b456e2db39004ae474f1934ead5b5743 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/ProtocolDiscoveryConfig.aidl b/nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/ProtocolDiscoveryConfig.aidl index 021dfe2..2df0d35 100644 --- a/nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/ProtocolDiscoveryConfig.aidl +++ b/nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/ProtocolDiscoveryConfig.aidl
@@ -43,4 +43,5 @@ byte discoveryPollKovio; byte discoveryPollBPrime; byte discoveryListenBPrime; + byte protocolChineseId; }
diff --git a/nfc/aidl/android/hardware/nfc/ProtocolDiscoveryConfig.aidl b/nfc/aidl/android/hardware/nfc/ProtocolDiscoveryConfig.aidl index f8e3228..021e307 100644 --- a/nfc/aidl/android/hardware/nfc/ProtocolDiscoveryConfig.aidl +++ b/nfc/aidl/android/hardware/nfc/ProtocolDiscoveryConfig.aidl
@@ -33,4 +33,5 @@ byte discoveryPollKovio; byte discoveryPollBPrime; byte discoveryListenBPrime; + byte protocolChineseId; }