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

Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev

Browse Source
This commit is contained in:
Sailesh Nepal
2014-11-06 06:14:14 +00:00
committed by Android (Google) Code Review
parent ff636d383c 7a69c9277f
commit db66e1d2b9
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28226,6 +28226,7 @@ package android.telecom {
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final int BUSY = 7; // 0x7 field public static final int BUSY = 7; // 0x7
field public static final int CANCELED = 4; // 0x4 field public static final int CANCELED = 4; // 0x4
field public static final int CONNECTION_MANAGER_NOT_SUPPORTED = 10; // 0xa
field public static final android.os.Parcelable.Creator<android.telecom.DisconnectCause> CREATOR; field public static final android.os.Parcelable.Creator<android.telecom.DisconnectCause> CREATOR;
field public static final int ERROR = 1; // 0x1 field public static final int ERROR = 1; // 0x1
field public static final int LOCAL = 2; // 0x2 field public static final int LOCAL = 2; // 0x2

20
telecomm/java/android/telecom/DisconnectCause.java
View File

@@ -58,6 +58,11 @@ public final class DisconnectCause implements Parcelable {
public static final int RESTRICTED = 8; public static final int RESTRICTED = 8;
/** Disconnected for reason not described by other disconnect codes. */ /** Disconnected for reason not described by other disconnect codes. */
public static final int OTHER = 9; public static final int OTHER = 9;
/**
* Disconnected because the connection manager did not support the call. The call will be tried
* again without a connection manager. See {@link PhoneAccount#CAPABILITY_CONNECTION_MANAGER}.
*/
public static final int CONNECTION_MANAGER_NOT_SUPPORTED = 10;
private int mDisconnectCode; private int mDisconnectCode;
private CharSequence mDisconnectLabel; private CharSequence mDisconnectLabel;
@@ -220,7 +225,10 @@ public final class DisconnectCause implements Parcelable {
@Override @Override
public String toString() { public String toString() {
String code = ""; String code = "";
switch (getCode()) { switch (mDisconnectCode) {
case UNKNOWN:
code = "UNKNOWN";
break;
case ERROR: case ERROR:
code = "ERROR"; code = "ERROR";
break; break;
@@ -230,6 +238,9 @@ public final class DisconnectCause implements Parcelable {
case REMOTE: case REMOTE:
code = "REMOTE"; code = "REMOTE";
break; break;
case CANCELED:
code = "CANCELED";
break;
case MISSED: case MISSED:
code = "MISSED"; code = "MISSED";
break; break;
@@ -245,9 +256,12 @@ public final class DisconnectCause implements Parcelable {
case OTHER: case OTHER:
code = "OTHER"; code = "OTHER";
break; break;
case UNKNOWN: case CONNECTION_MANAGER_NOT_SUPPORTED:
code = "CONNECTION_MANAGER_NOT_SUPPORTED";
break;
default: default:
code = "UNKNOWN"; code = "invalid code: " + mDisconnectCode;
break;
} }
String label = mDisconnectLabel == null ? "" : mDisconnectLabel.toString(); String label = mDisconnectLabel == null ? "" : mDisconnectLabel.toString();
String description = mDisconnectDescription == null String description = mDisconnectDescription == null