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

Commit 6d768fb7 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "ServiceState#dataRegState",... 

Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: c289c9b0 am: 506d5c92 am: 507e3b9d

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

Change-Id: Ic8faff9d023b492da5eb7e31e281ddfbf49c8d1d
parents de0c5fa0 507e3b9d

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35551,6 +35551,7 @@ package android.provider { 
    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 DATA_REG_STATE = "data_reg_state";

    field public static final String DUPLEX_MODE = "duplex_mode";

    field public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

    field public static final String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2333,6 +2333,7 @@ package android.telephony { 
  public class ServiceState implements android.os.Parcelable {

    method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo);

    method public int getDataNetworkType();

    method public int getDataRegState();

    method public void setCdmaSystemAndNetworkId(int, int);

    method public void setCellBandwidths(int[]);

    method public void setChannelNumber(int);

core/java/android/provider/Telephony.java

+9 −0
Original line number Diff line number Diff line
@@ -4558,6 +4558,15 @@ public final class Telephony { 
         */

        public static final String VOICE_REG_STATE = "voice_reg_state";



        /**

         * An integer value indicating the current data service state.

         * <p>

         * Valid values: {@link ServiceState#STATE_IN_SERVICE},

         * {@link ServiceState#STATE_OUT_OF_SERVICE}, {@link ServiceState#STATE_EMERGENCY_ONLY},

         * {@link ServiceState#STATE_POWER_OFF}.

         */

        public static final String DATA_REG_STATE = "data_reg_state";



        /**

         * The current registered operator numeric id.

         * <p>

telephony/java/android/telephony/ServiceState.java

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ public class ServiceState implements Parcelable { 
     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    public int getDataRegState() {

        return mDataRegState;

    }