From 3a72957b4b7704a83e99064b082e3980777e541d Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Sat, 17 Apr 2021 15:04:04 -0700 Subject: [PATCH 1/2] Disallow data when QNS switched the preference When the preference has switched to another transport, do not allow data setup. This avoid the case that data service keeps asking telephony to retry while QNS already switched the preference to another transport. Test: Manual Fix: 182899920 Fix: 175399007 Merged-In: I1a0c86a978756d5b05851d939e011010f8f1afc2 Change-Id: I1a0c86a978756d5b05851d939e011010f8f1afc2 (cherry picked from commit 50a8fccec78c09d70e428a729d56c011776a15c4) --- telephony/java/android/telephony/AccessNetworkConstants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java index 96e715ee0495b..1d7a4761dec6c 100644 --- a/telephony/java/android/telephony/AccessNetworkConstants.java +++ b/telephony/java/android/telephony/AccessNetworkConstants.java @@ -62,6 +62,7 @@ public final class AccessNetworkConstants { switch (transportType) { case TRANSPORT_TYPE_WWAN: return "WWAN"; case TRANSPORT_TYPE_WLAN: return "WLAN"; + case TRANSPORT_TYPE_INVALID: return "INVALID"; default: return Integer.toString(transportType); } } From 7e0ae7528d1a801574a27a8161ac48275210c39f Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Tue, 27 Apr 2021 21:18:52 +0800 Subject: [PATCH 2/2] [Telephony] Clean up: remove getApnTypeStringInternal Bug: 181696914 Test: make Merged-In: Ia79bb9eaa1fc43a2995730da47289274f94d67fe Change-Id: Ia79bb9eaa1fc43a2995730da47289274f94d67fe (cherry picked from commit 6930ca1e6d0a4bca33c376a227a5954bfb243e2d) --- telephony/java/android/telephony/data/ApnSetting.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index bb90fb17f4bbf..be1502ad49f23 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -1581,16 +1581,6 @@ public class ApnSetting implements Parcelable { return apnTypeString == null ? "" : apnTypeString; } - /** - * Same as {@link #getApnTypeString(int)}, but returns "Unknown" instead of an empty string - * when provided with an invalid int for compatibility purposes. - * @hide - */ - public static @NonNull String getApnTypeStringInternal(@ApnType int apnType) { - String result = getApnTypeString(apnType); - return TextUtils.isEmpty(result) ? "Unknown" : result; - } - /** * Converts the string representation of an APN type to its integer representation. *