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

Commit 8fadaef0 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose ServiceState#getDataNetworkType in telephony provider" am:... 

Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a523 am: 11264381 am: ff97f102

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

Change-Id: Ib2c5d3ec7b28e37d1fa7426aa9e0a1bc7730b9e8
parents 3753311f ff97f102

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35548,6 +35548,7 @@ package android.provider { 
    method public static android.net.Uri getUriForSubscriptionIdAndField(int, String);

    field public static final String AUTHORITY = "service-state";

    field public static final android.net.Uri CONTENT_URI;

    field public static final String DATA_NETWORK_TYPE = "data_network_type";

    field public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

    field public static final String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";

    field public static final String VOICE_REG_STATE = "voice_reg_state";

core/java/android/provider/Telephony.java

+7 −0
Original line number Diff line number Diff line
@@ -4574,6 +4574,13 @@ public final class Telephony { 
         * This is the same as {@link ServiceState#getIsManualSelection()}.

         */

        public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";



        /**

         * The current data network type.

         * <p>

         * This is the same as {@link TelephonyManager#getDataNetworkType()}.

         */

        public static final String DATA_NETWORK_TYPE = "data_network_type";

    }



    /**