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

resolve merge conflicts of 1d0d34348c to qt-r1-dev-plus-aos

Browse Source 
Change-Id: I8c452c8e12f6ac3549480635132eab9d2ba03e2c
Bug: None
Test: Merge
This commit is contained in:
Tyler Gunn
2019-08-01 08:57:28 -07:00
parent 4876d43bff 1d0d34348c
commit 1c9d219e15
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,6 +340,19 @@ public final class DisconnectCause {
*/
public static final int MEDIA_TIMEOUT = 77;
/**
* Indicates that an emergency call cannot be placed over WFC because the service is not
* available in the current location.
* @hide
*/
public static final int EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE = 78;
/**
* Indicates that WiFi calling service is not available in the current location.
* @hide
*/
public static final int WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION = 79;
//*********************************************************************************************
// When adding a disconnect type:
// 1) Update toString() with the newly added disconnect type.
@@ -510,6 +523,10 @@ public final class DisconnectCause {
return "OTASP_PROVISIONING_IN_PROCESS";
case MEDIA_TIMEOUT:
return "MEDIA_TIMEOUT";
case EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE:
return "EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE";
case WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION:
return "WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION";
default:
return "INVALID: " + cause;
}

13
telephony/java/android/telephony/ims/ImsReasonInfo.java
View File

@@ -871,6 +871,19 @@ public final class ImsReasonInfo implements Parcelable {
*/
public static final int CODE_REJECT_ONGOING_CS_CALL = 1621;
/**
* An attempt was made to place an emergency call over WFC when emergency services is not
* currently available in the current location.
* @hide
*/
public static final int CODE_EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE = 1622;
/**
* Indicates that WiFi calling service is not available in the current location.
* @hide
*/
public static final int CODE_WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION = 1623;
/*
* OEM specific error codes. To be used by OEMs when they don't want to reveal error code which
* would be replaced by ERROR_UNSPECIFIED.