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

Commit f5b06ea4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add satellite modem busy error code." into udc-dev am: 95977e06 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22612534



Change-Id: Ibe3dda1c0ba51731b834de1f66947a706693ba27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4d316a0 95977e06

telephony/java/android/telephony/satellite/SatelliteManager.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -278,6 +278,11 @@ public class SatelliteManager { 
     */

     */

    public static final int SATELLITE_REQUEST_IN_PROGRESS = 21;

    public static final int SATELLITE_REQUEST_IN_PROGRESS = 21;





    /**

     * Satellite modem is currently busy due to which current request cannot be processed.

     */

    public static final int SATELLITE_MODEM_BUSY = 22;



    /** @hide */

    /** @hide */

    @IntDef(prefix = {"SATELLITE_"}, value = {

    @IntDef(prefix = {"SATELLITE_"}, value = {

            SATELLITE_ERROR_NONE,

            SATELLITE_ERROR_NONE,
@@ -301,7 +306,8 @@ public class SatelliteManager { 
            SATELLITE_NOT_REACHABLE,

            SATELLITE_NOT_REACHABLE,

            SATELLITE_NOT_AUTHORIZED,

            SATELLITE_NOT_AUTHORIZED,

            SATELLITE_NOT_SUPPORTED,

            SATELLITE_NOT_SUPPORTED,

            SATELLITE_REQUEST_IN_PROGRESS

            SATELLITE_REQUEST_IN_PROGRESS,

            SATELLITE_MODEM_BUSY

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface SatelliteError {}

    public @interface SatelliteError {}