| commit | 9059a92d162f25307a055d7334bd77ada95b2129 | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Wed Nov 10 20:59:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 10 20:59:05 2021 +0000 |
| tree | ef612e5e8b1acd74655b005f534dedb1c56a9595 | |
| parent | 5a725c7f0f03655ad1c54819882a1d0a98e320a8 [diff] | |
| parent | e2b1c7c0c32d89dca86a1d16d6575cbb40becaea [diff] |
Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3da6 am: e2b1c7c0c3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875273 Change-Id: I3949421a6e9de16d736e4a70d74ca5e5fdce2ec9
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl index 2cfb8d0..5cc9017 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl
@@ -36,7 +36,5 @@ parcelable SimPortInfo { String iccId; int logicalSlotId; - int portState; - const int PORT_STATE_INACTIVE = 0; - const int PORT_STATE_ACTIVE = 1; + boolean portActive; }
diff --git a/radio/aidl/android/hardware/radio/config/SimPortInfo.aidl b/radio/aidl/android/hardware/radio/config/SimPortInfo.aidl index 78f1309..54b9890 100644 --- a/radio/aidl/android/hardware/radio/config/SimPortInfo.aidl +++ b/radio/aidl/android/hardware/radio/config/SimPortInfo.aidl
@@ -34,18 +34,10 @@ * Logical slot id is identifier of the active slot */ int logicalSlotId; - /* - * Port is Inactive - * Inactive means logical modem is no longer associated to the port - */ - const int PORT_STATE_INACTIVE = 0; - /* - * Port is Active - * Active means logical modem is associated to the port - */ - const int PORT_STATE_ACTIVE = 1; /** - * Port state in the slot. Values are portState.[PORT_STATE_INACTIVE, PORT_STATE_ACTIVE]. + * Port active status in the slot. + * Inactive means logical modem is no longer associated to the port. + * Active means logical modem is associated to the port. */ - int portState; + boolean portActive; }