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

Commit 6e31aa0a authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Revert "Revert "Rename CONNECTED and NOT CONNECTED to IN SERVICE..." 

Revert submission 29140667-revert-28767256-349504154-FALOSHWLSG

Reason for revert: Fixed conflict reason and updated

Reverted changes: /q/submissionid:29140667-revert-28767256-349504154-FALOSHWLSG

Change-Id: Idee23933f6fcbd35faddef002810f9c4b44c16a4
parent 85da168a

telephony/java/android/telephony/satellite/stub/SatelliteModemState.aidl

+5 −5
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ package android.telephony.satellite.stub; 
@Backing(type="int")

@Backing(type="int")

enum SatelliteModemState {

enum SatelliteModemState {

    /**

    /**

     * Satellite modem is in idle state.

     * Satellite Idle state during which modem will scan for TN networks.

     */

     */

    SATELLITE_MODEM_STATE_IDLE = 0,

    SATELLITE_MODEM_STATE_IDLE = 0,

    /**

    /**
@@ -46,13 +46,13 @@ enum SatelliteModemState { 
     */

     */

    SATELLITE_MODEM_STATE_UNAVAILABLE = 5,

    SATELLITE_MODEM_STATE_UNAVAILABLE = 5,

    /**

    /**

     * The satellite modem is powered on but the device is not registered to a satellite cell.

     * The satellite modem is powered on but the device is out of service.

     */

     */

    SATELLITE_MODEM_STATE_NOT_CONNECTED = 6,

    SATELLITE_MODEM_STATE_OUT_OF_SERVICE = 6,

    /**

    /**

     * The satellite modem is powered on and the device is registered to a satellite cell.

     * The satellite modem is powered on and the device is registered and in service.

     */

     */

    SATELLITE_MODEM_STATE_CONNECTED = 7,

    SATELLITE_MODEM_STATE_IN_SERVICE = 7,

    /**

    /**

     * Satellite modem state is unknown. This generic modem state should be used only when the

     * Satellite modem state is unknown. This generic modem state should be used only when the

     * modem state cannot be mapped to other specific modem states.

     * modem state cannot be mapped to other specific modem states.