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

Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT."

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-01-17 21:34:02 +00:00
committed by Gerrit Code Review
parent 1699bb7d92 681cba5ef5
commit 54ad67f884
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -43336,7 +43336,7 @@ package android.telephony.data {
field public static final int PROTOCOL_IPV6 = 1; // 0x1
field public static final int PROTOCOL_PPP = 3; // 0x3
field public static final int TYPE_CBS = 128; // 0x80
field public static final int TYPE_DEFAULT = 1; // 0x1
field public static final int TYPE_DEFAULT = 17; // 0x11
field public static final int TYPE_DUN = 8; // 0x8
field public static final int TYPE_EMERGENCY = 512; // 0x200
field public static final int TYPE_FOTA = 32; // 0x20

4
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -81,7 +81,7 @@ public class ApnSetting implements Parcelable {
*/
public static final int TYPE_ALL = ApnTypes.ALL;
/** APN type for default data traffic. */
public static final int TYPE_DEFAULT = ApnTypes.DEFAULT;
public static final int TYPE_DEFAULT = ApnTypes.DEFAULT | ApnTypes.HIPRI;
/** APN type for MMS traffic. */
public static final int TYPE_MMS = ApnTypes.MMS;
/** APN type for SUPL assisted GPS. */
@@ -1019,7 +1019,7 @@ public class ApnSetting implements Parcelable {
return false;
}
// DEFAULT can handle HIPRI.
if (hasApnType(type) || (type == TYPE_HIPRI && hasApnType(TYPE_DEFAULT))) {
if (hasApnType(type)) {
return true;
}
return false;