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

Merge "expose datafail cause used in telephony-sdk annotation class" am: 20e05a4660 am: 65f7a4ac6b

Browse Source 
Change-Id: Ibfa10b0c9dadceead0137e10508ce40465a2e7fd
This commit is contained in:
Automerger Merge Worker
2019-12-10 22:10:31 +00:00
parent 19f573a89b 65f7a4ac6b
commit fd536b0cfc
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8238,6 +8238,7 @@ package android.telephony {
field public static final int UE_SECURITY_CAPABILITIES_MISMATCH = 2185; // 0x889 field public static final int UE_SECURITY_CAPABILITIES_MISMATCH = 2185; // 0x889
field public static final int UMTS_HANDOVER_TO_IWLAN = 2199; // 0x897 field public static final int UMTS_HANDOVER_TO_IWLAN = 2199; // 0x897
field public static final int UMTS_REACTIVATION_REQ = 39; // 0x27 field public static final int UMTS_REACTIVATION_REQ = 39; // 0x27
field public static final int UNACCEPTABLE_NETWORK_PARAMETER = 65538; // 0x10002
field public static final int UNACCEPTABLE_NON_EPS_AUTHENTICATION = 2187; // 0x88b field public static final int UNACCEPTABLE_NON_EPS_AUTHENTICATION = 2187; // 0x88b
field public static final int UNKNOWN = 65536; // 0x10000 field public static final int UNKNOWN = 65536; // 0x10000
field public static final int UNKNOWN_INFO_ELEMENT = 99; // 0x63 field public static final int UNKNOWN_INFO_ELEMENT = 99; // 0x63

2
telephony/java/android/telephony/Annotation.java
View File

@@ -463,9 +463,7 @@ public class Annotation {
DataFailCause.UNKNOWN, DataFailCause.UNKNOWN,
DataFailCause.RADIO_NOT_AVAILABLE, DataFailCause.RADIO_NOT_AVAILABLE,
DataFailCause.UNACCEPTABLE_NETWORK_PARAMETER, DataFailCause.UNACCEPTABLE_NETWORK_PARAMETER,
DataFailCause.CONNECTION_TO_DATACONNECTIONAC_BROKEN,
DataFailCause.LOST_CONNECTION, DataFailCause.LOST_CONNECTION,
DataFailCause.RESET_BY_FRAMEWORK
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface DataFailureCause { public @interface DataFailureCause {

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

@@ -953,14 +953,10 @@ public final class DataFailCause {
public static final int UNKNOWN = 0x10000; public static final int UNKNOWN = 0x10000;
/** Data fail due to radio not unavailable. */ /** Data fail due to radio not unavailable. */
public static final int RADIO_NOT_AVAILABLE = 0x10001; /* no retry */ public static final int RADIO_NOT_AVAILABLE = 0x10001; /* no retry */
/** @hide */ /** Data fail due to unacceptable network parameter. */
public static final int UNACCEPTABLE_NETWORK_PARAMETER = 0x10002; /* no retry */ public static final int UNACCEPTABLE_NETWORK_PARAMETER = 0x10002; /* no retry */
/** @hide */
public static final int CONNECTION_TO_DATACONNECTIONAC_BROKEN = 0x10003;
/** Data connection was lost. */ /** Data connection was lost. */
public static final int LOST_CONNECTION = 0x10004; public static final int LOST_CONNECTION = 0x10004;
/** @hide */
public static final int RESET_BY_FRAMEWORK = 0x10005;
/** /**
* Data handover failed. * Data handover failed.
@@ -1364,10 +1360,7 @@ public final class DataFailCause {
sFailCauseMap.put(RADIO_NOT_AVAILABLE, "RADIO_NOT_AVAILABLE"); sFailCauseMap.put(RADIO_NOT_AVAILABLE, "RADIO_NOT_AVAILABLE");
sFailCauseMap.put(UNACCEPTABLE_NETWORK_PARAMETER, sFailCauseMap.put(UNACCEPTABLE_NETWORK_PARAMETER,
"UNACCEPTABLE_NETWORK_PARAMETER"); "UNACCEPTABLE_NETWORK_PARAMETER");
sFailCauseMap.put(CONNECTION_TO_DATACONNECTIONAC_BROKEN,
"CONNECTION_TO_DATACONNECTIONAC_BROKEN");
sFailCauseMap.put(LOST_CONNECTION, "LOST_CONNECTION"); sFailCauseMap.put(LOST_CONNECTION, "LOST_CONNECTION");
sFailCauseMap.put(RESET_BY_FRAMEWORK, "RESET_BY_FRAMEWORK");
} }
private DataFailCause() { private DataFailCause() {