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

Merge changes from topic 'am-77f1c064e37e4a04b3ba081a7c5bc7db' into nyc-mr1-dev-plus-aosp

Browse Source 
* changes:
  Merge "Adds a Disconnect Cause for Emergency Redial" into nyc-mr1-dev am: 0a2d3dcb03 am: 831c6a83d8
  Adds a Disconnect Cause for Emergency Redial am: bd13f22f83 am: 7c8ad05c56
This commit is contained in:
Android Build Merger (Role)
2016-09-26 23:52:42 +00:00
committed by Android (Google) Code Review
parent 94eb506eef 5b3681500c
commit 8b27699fff
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/DisconnectCause.java
View File

@@ -226,6 +226,13 @@ public class DisconnectCause {
*/
public static final int DATA_LIMIT_REACHED = 55;
/**
* The emergency call was terminated because it was dialed on the wrong SIM slot.
* The call needs to be redialed the other slot.
* {@hide}
*/
public static final int DIALED_ON_WRONG_SLOT = 56;
//*********************************************************************************************
// When adding a disconnect type:
// 1) Please assign the new type the next id value below.
@@ -234,14 +241,14 @@ public class DisconnectCause {
// 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
//
// NextId: 56
// NextId: 57
//*********************************************************************************************
/** Smallest valid value for call disconnect codes. */
public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;
/** Largest valid value for call disconnect codes. */
public static final int MAXIMUM_VALID_VALUE = DATA_LIMIT_REACHED;
public static final int MAXIMUM_VALID_VALUE = DIALED_ON_WRONG_SLOT;
/** Private constructor to avoid class instantiation. */
private DisconnectCause() {
@@ -361,6 +368,8 @@ public class DisconnectCause {
return "DATA_DISABLED";
case DATA_LIMIT_REACHED:
return "DATA_LIMIT_REACHED";
case DIALED_ON_WRONG_SLOT:
return "DIALED_ON_WRONG_SLOT";
default:
return "INVALID: " + cause;
}