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

am "Fix emergency callback number not shown for incoming calls."

Browse Source 
merged from goog/mirror-m-wireless-internal-release
068085b Fix emergency callback number not shown for incoming calls.
This commit is contained in:
Vinit Deshpande
2015-03-15 13:44:19 -07:00
parent e6501ab728 068085b35d
commit 522dbda5d4
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telecomm/java/android/telecom/Call.java
View File

@@ -212,6 +212,13 @@ public final class Call {
// Next CAPABILITY value: 0x00020000
//******************************************************************************************
/**
* Indicates that the current device callback number should be shown.
*
* @hide
*/
public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
private final Uri mHandle;
private final int mHandlePresentation;
private final String mCallerDisplayName;
@@ -306,6 +313,9 @@ public final class Call {
if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
builder.append(" CAPABILITY_GENERIC_CONFERENCE");
}
if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
}
builder.append("]");
return builder.toString();
}

12
telecomm/java/android/telecom/Connection.java
View File

@@ -177,6 +177,15 @@ public abstract class Connection implements IConferenceable {
// Next CAPABILITY value: 0x00020000
//**********************************************************************************************
/**
* Indicates that the current device callback number should be shown.
*
* @hide
*/
public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -275,6 +284,9 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
builder.append(" CAPABILITY_GENERIC_CONFERENCE");
}
if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
}
builder.append("]");
return builder.toString();
}