Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create the ID for each gating key. Modify the names and descriptions per Compat team requirement." am: 5aa9de8cf1 am: de7f6750ab

Browse Source 
Change-Id: Ic94a3f8808ce0c5ee7de0c6c8256725b7af6b515
This commit is contained in:
Automerger Merge Worker
2020-01-31 20:31:05 +00:00
parent 2663a58931 de7f6750ab
commit a239039079
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/PreciseDataConnectionState.java
View File

@@ -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;
}

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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;
}