Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3da6 am: e2b1c7c0c3 am: 9059a92d16

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875273

Change-Id: I13b944dce5e0b989dca2e4b4ea5976dcec9d37a0
This commit is contained in:
Chen Xu 2021-11-10 21:16:28 +00:00 committed by Automerger Merge Worker
commit 91eb3c269b
2 changed files with 5 additions and 15 deletions

View file

@ -36,7 +36,5 @@ package android.hardware.radio.config;
parcelable SimPortInfo {
String iccId;
int logicalSlotId;
int portState;
const int PORT_STATE_INACTIVE = 0;
const int PORT_STATE_ACTIVE = 1;
boolean portActive;
}

View file

@ -34,18 +34,10 @@ parcelable SimPortInfo {
* 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;
}