From 681cba5ef5d1ad965b6b9bf24f3d25cb99bc3de1 Mon Sep 17 00:00:00 2001 From: yuemingw Date: Tue, 25 Sep 2018 18:12:52 +0100 Subject: Revert to previous constant value for ApnSetting.TYPE_DEFAULT. Bug: 113097474 Test: m -j && atest ApnSettingTest Change-Id: Iadbb5cde21a9f1fff77000f10cee218ca9806b2e --- api/current.txt | 2 +- telephony/java/android/telephony/data/ApnSetting.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 69be5e599a1c..e4ecd5ee9798 100755 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 200b5403eea9..8d148c36f3e7 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -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; -- cgit v1.2.3-59-g8ed1b