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

Commit 4be3212b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Add SubscriptionManager APIs for satellite communication." am: b8a1b57b 

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



Change-Id: Ib7f1acf060b832707312fe3e7c2e1fad84fb030e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80e6084a b8a1b57b

core/java/android/provider/Telephony.java

+10 −1
Original line number Diff line number Diff line
@@ -4842,6 +4842,14 @@ public final class Telephony { 
         */

        public static final String COLUMN_USER_HANDLE = "user_handle";



        /**

         * TelephonyProvider column name for satellite enabled.

         * By default, it's disabled.

         *

         * @hide

         */

        public static final String COLUMN_SATELLITE_ENABLED = "satellite_enabled";



        /** All columns in {@link SimInfo} table. */

        private static final List<String> ALL_COLUMNS = List.of(

                COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -4910,7 +4918,8 @@ public final class Telephony { 
                COLUMN_PORT_INDEX,

                COLUMN_USAGE_SETTING,

                COLUMN_TP_MESSAGE_REF,

                COLUMN_USER_HANDLE

                COLUMN_USER_HANDLE,

                COLUMN_SATELLITE_ENABLED

        );



        /**

telephony/java/android/telephony/SubscriptionManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,14 @@ public class SubscriptionManager { 
     */

    public static final String USER_HANDLE = SimInfo.COLUMN_USER_HANDLE;



    /**

     * TelephonyProvider column name for satellite enabled.

     * By default, it's disabled.

     * <P>Type: INTEGER (int)</P>

     * @hide

     */

    public static final String SATELLITE_ENABLED = SimInfo.COLUMN_SATELLITE_ENABLED;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"USAGE_SETTING_"},