| commit | 9a48be209fe0f0508f946c89e244c6d4ebbcaa3b | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Wed Nov 10 21:33:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 10 21:33:40 2021 +0000 |
| tree | c6b75360fc7b797c51030988a4809bba3a1aeef8 | |
| parent | 768bd063bc39ba41a8f2fb17b61b37da977549e7 [diff] | |
| parent | 91eb3c269b4d2177df367d4dd5a180be668c6061 [diff] |
Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3da6 am: e2b1c7c0c3 am: 9059a92d16 am: 91eb3c269b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875273 Change-Id: I166f4a8a6dbc1fe31f08e7a2424e2cabd1d84a03
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; }