Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91eb3c26 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "Replacing SimPortInfo.portState enum with portActive flag" am:... 

Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3d am: e2b1c7c0 am: 9059a92d

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

Change-Id: I13b944dce5e0b989dca2e4b4ea5976dcec9d37a0
parents a85a824d 9059a92d

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

radio/aidl/android/hardware/radio/config/SimPortInfo.aidl

+4 −12
Original line number Diff line number Diff line
@@ -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;

}