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

Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev

Browse Source
This commit is contained in:
Hall Liu
2016-08-31 17:38:51 +00:00
committed by Android (Google) Code Review
parent e9a9e6b92c 25c7c4d100
commit 4c01673a7b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,7 +327,7 @@ public abstract class Connection extends Conferenceable {
* *
* @hide * @hide
*/ */
public static final int PROPERTY_SHOW_CALLBACK_NUMBER = 1<<0; public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 1<<0;
/** /**
* Whether the call is a generic conference, where we do not know the precise state of * Whether the call is a generic conference, where we do not know the precise state of
@@ -655,8 +655,8 @@ public abstract class Connection extends Conferenceable {
builder.append("Properties:"); builder.append("Properties:");
} }
if (can(properties, PROPERTY_SHOW_CALLBACK_NUMBER)) { if (can(properties, PROPERTY_EMERGENCY_CALLBACK_MODE)) {
builder.append(isLong ? " PROPERTY_SHOW_CALLBACK_NUMBER" : " clbk"); builder.append(isLong ? " PROPERTY_EMERGENCY_CALLBACK_MODE" : " ecbm");
} }
if (can(properties, PROPERTY_HIGH_DEF_AUDIO)) { if (can(properties, PROPERTY_HIGH_DEF_AUDIO)) {