Merge changes from topics "deactivate_no_tds", "deactivate_no_tds_revert" am: 82bb853ff6 am: 8fb0b7d82f

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

Change-Id: I1854c999934c727df5cac98ceb482743d92a09d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Chin
2022-04-06 08:12:43 +00:00
committed by Automerger Merge Worker

View File

@@ -1090,13 +1090,6 @@ public final class DataFailCause {
*/
public static final int NO_RETRY_FAILURE = 0x1000B;
/**
* Traffic descriptors in DataCallResponse is empty.
*
* @hide
*/
public static final int NO_TRAFFIC_DESCRIPTORS = 0x1000C;
private static final Map<Integer, String> sFailCauseMap;
static {
sFailCauseMap = new HashMap<>();
@@ -1531,7 +1524,6 @@ public final class DataFailCause {
sFailCauseMap.put(SERVICE_TEMPORARILY_UNAVAILABLE, "SERVICE_TEMPORARILY_UNAVAILABLE");
sFailCauseMap.put(REQUEST_NOT_SUPPORTED, "REQUEST_NOT_SUPPORTED");
sFailCauseMap.put(NO_RETRY_FAILURE, "NO_RETRY_FAILURE");
sFailCauseMap.put(NO_TRAFFIC_DESCRIPTORS, "NO_TRAFFIC_DESCRIPTORS");
}
private DataFailCause() {