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 
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
This commit is contained in:
Robert Greenwalt
2017-01-03 11:35:37 -08:00
parent 29d656dbe1 e6b6653da8
commit 5f0dad0e64
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

@@ -240,6 +240,13 @@ public class DisconnectCause {
*/ */
public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57; 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: // When adding a disconnect type:
// 1) Please assign the new type the next id value below. // 1) Please assign the new type the next id value below.
@@ -248,14 +255,14 @@ public class DisconnectCause {
// 4) Update toString() with the newly added disconnect type. // 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause. // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
// //
// NextId: 58 // NextId: 59
//********************************************************************************************* //*********************************************************************************************
/** Smallest valid value for call disconnect codes. */ /** Smallest valid value for call disconnect codes. */
public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED; public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;
/** Largest valid value for call disconnect codes. */ /** 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 constructor to avoid class instantiation. */
private DisconnectCause() { private DisconnectCause() {
@@ -379,6 +386,8 @@ public class DisconnectCause {
return "DIALED_ON_WRONG_SLOT"; return "DIALED_ON_WRONG_SLOT";
case DIALED_CALL_FORWARDING_WHILE_ROAMING: case DIALED_CALL_FORWARDING_WHILE_ROAMING:
return "DIALED_CALL_FORWARDING_WHILE_ROAMING"; return "DIALED_CALL_FORWARDING_WHILE_ROAMING";
case IMEI_NOT_ACCEPTED:
return "IMEI_NOT_ACCEPTED";
default: default:
return "INVALID: " + cause; return "INVALID: " + cause;
} }