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

resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp

Browse Source 
am: 5f0dad0e64

Change-Id: Icbd5899dd0c8a35be4c290b3aeab29d46c64e1c0
This commit is contained in:
Robert Greenwalt
2017-01-03 19:48:04 +00:00
committed by android-build-merger
parent 50e0a9a396 5f0dad0e64
commit 7751269d37
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

@@ -239,6 +239,13 @@ public class DisconnectCause {
*/
public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57;
/**
* The network does not accept the emergency call request because IMEI was used as
* identification and this cability is not supported by the network.
* {@hide}
*/
public static final int IMEI_NOT_ACCEPTED = 58;
//*********************************************************************************************
// When adding a disconnect type:
// 1) Please assign the new type the next id value below.
@@ -247,14 +254,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: 58
// NextId: 59
//*********************************************************************************************
/** 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 = DIALED_CALL_FORWARDING_WHILE_ROAMING;
public static final int MAXIMUM_VALID_VALUE = IMEI_NOT_ACCEPTED;
/** Private constructor to avoid class instantiation. */
private DisconnectCause() {
@@ -378,6 +385,8 @@ public class DisconnectCause {
return "DIALED_ON_WRONG_SLOT";
case DIALED_CALL_FORWARDING_WHILE_ROAMING:
return "DIALED_CALL_FORWARDING_WHILE_ROAMING";
case IMEI_NOT_ACCEPTED:
return "IMEI_NOT_ACCEPTED";
default:
return "INVALID: " + cause;
}