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

Commit 5aa9de8c authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Create the ID for each gating key. Modify the names and descriptions... 

Merge "Create the ID for each gating key. Modify the names and descriptions per Compat team requirement."
parents ec5c5b57 7801d982

telephony/java/android/telephony/PreciseDataConnectionState.java

+4 −3
Original line number Diff line number Diff line
@@ -135,11 +135,12 @@ public final class PreciseDataConnectionState implements Parcelable { 
    }



    /**

     * To check the SDK version for {@link PreciseDataConnectionState#getDataConnectionState}.

     * Used for checking if the SDK version for

     * {@code PreciseDataConnectionState#getDataConnectionState} is above Q.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)

    private static final long GET_DATA_CONNECTION_STATE_CODE_CHANGE = 147600208L;

    private static final long GET_DATA_CONNECTION_STATE_R_VERSION = 148535736L;



    /**

     * Returns the state of data connection that supported the apn types returned by
@@ -152,7 +153,7 @@ public final class PreciseDataConnectionState implements Parcelable { 
    @SystemApi

    public @DataState int getDataConnectionState() {

        if (mState == TelephonyManager.DATA_DISCONNECTING

                && !Compatibility.isChangeEnabled(GET_DATA_CONNECTION_STATE_CODE_CHANGE)) {

                && !Compatibility.isChangeEnabled(GET_DATA_CONNECTION_STATE_R_VERSION)) {

            return TelephonyManager.DATA_CONNECTED;

        }

telephony/java/android/telephony/TelephonyManager.java

+3 −3
Original line number Diff line number Diff line
@@ -5209,11 +5209,11 @@ public class TelephonyManager { 
    public static final int DATA_DISCONNECTING = 4;



    /**

     * To check the SDK version for {@link TelephonyManager#getDataState}.

     * Used for checking if the SDK version for {@link TelephonyManager#getDataState} is above Q.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)

    private static final long GET_DATA_STATE_CODE_CHANGE = 147600208L;

    private static final long GET_DATA_STATE_R_VERSION = 148534348L;



    /**

     * Returns a constant indicating the current data connection state
@@ -5233,7 +5233,7 @@ public class TelephonyManager { 
            int state = telephony.getDataStateForSubId(

                    getSubId(SubscriptionManager.getActiveDataSubscriptionId()));

            if (state == TelephonyManager.DATA_DISCONNECTING

                    && !Compatibility.isChangeEnabled(GET_DATA_STATE_CODE_CHANGE)) {

                    && !Compatibility.isChangeEnabled(GET_DATA_STATE_R_VERSION)) {

                return TelephonyManager.DATA_CONNECTED;

            }