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

Merge "Fixed several data issues" am: 90ee4528a3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034143

Change-Id: I533efde718f6a08ce5e656494121d8bab7bd4f23
This commit is contained in:
Sarah Chin
2022-03-21 20:59:22 +00:00
committed by Automerger Merge Worker
parent 11f453bf93 90ee4528a3
commit 6c4b32c7e4
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/DataFailCause.java
View File

@@ -1083,6 +1083,13 @@ public final class DataFailCause {
*/ */
public static final int REQUEST_NOT_SUPPORTED = 0x1000A; public static final int REQUEST_NOT_SUPPORTED = 0x1000A;
/**
* An internal setup data error initiated by telephony that no retry should be performed.
*
* @hide
*/
public static final int NO_RETRY_FAILURE = 0x1000B;
private static final Map<Integer, String> sFailCauseMap; private static final Map<Integer, String> sFailCauseMap;
static { static {
sFailCauseMap = new HashMap<>(); sFailCauseMap = new HashMap<>();
@@ -1515,6 +1522,8 @@ public final class DataFailCause {
sFailCauseMap.put(DUPLICATE_CID, "DUPLICATE_CID"); sFailCauseMap.put(DUPLICATE_CID, "DUPLICATE_CID");
sFailCauseMap.put(NO_DEFAULT_DATA, "NO_DEFAULT_DATA"); sFailCauseMap.put(NO_DEFAULT_DATA, "NO_DEFAULT_DATA");
sFailCauseMap.put(SERVICE_TEMPORARILY_UNAVAILABLE, "SERVICE_TEMPORARILY_UNAVAILABLE"); sFailCauseMap.put(SERVICE_TEMPORARILY_UNAVAILABLE, "SERVICE_TEMPORARILY_UNAVAILABLE");
sFailCauseMap.put(REQUEST_NOT_SUPPORTED, "REQUEST_NOT_SUPPORTED");
sFailCauseMap.put(NO_RETRY_FAILURE, "NO_RETRY_FAILURE");
} }
private DataFailCause() { private DataFailCause() {
@@ -1565,6 +1574,7 @@ public final class DataFailCause {
} }
/** @hide */ /** @hide */
// TODO: Migrated to DataConfigManager
public static boolean isPermanentFailure(@NonNull Context context, public static boolean isPermanentFailure(@NonNull Context context,
@DataFailureCause int failCause, @DataFailureCause int failCause,
int subId) { int subId) {
@@ -1621,6 +1631,7 @@ public final class DataFailCause {
}; };
} }
permanentFailureSet.add(NO_RETRY_FAILURE);
sPermanentFailureCache.put(subId, permanentFailureSet); sPermanentFailureCache.put(subId, permanentFailureSet);
} }