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

Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Browse Source 
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
This commit is contained in:
Prerepa Viswanadham
2015-03-24 13:46:08 -07:00
parent a7b212d9f1 d35f8862ac
commit 4209a28270
23 changed files with 760 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ public abstract class Connection implements IConferenceable {
* Connection is using WIFI.
* @hide
*/
public static final int CAPABILITY_WIFI = 0x000010000;
public static final int CAPABILITY_WIFI = 0x00010000;
/**
* Indicates that the current device callback number should be shown.
@@ -292,7 +292,7 @@ public abstract class Connection implements IConferenceable {
builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
}
if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO");
builder.append(" CAPABILITY_SPEED_UP_MT_AUDIO");
}
builder.append("]");
return builder.toString();