diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-03-24 13:46:08 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-03-24 13:46:08 -0700 |
| commit | 4209a28270a70016ee5ee6cae3dc96d6df0ade26 (patch) | |
| tree | 0b34ced229a97011fe75b96fc2ac8c57ab346f02 /telecomm/java/android/telecom | |
| parent | a7b212d9f10bb4f2b7fb2f926587f6e904a85579 (diff) | |
| parent | d35f8862ac2167285ace52c10a4f921fb1dbb873 (diff) | |
| download | frameworks_base-4209a28270a70016ee5ee6cae3dc96d6df0ade26.zip frameworks_base-4209a28270a70016ee5ee6cae3dc96d6df0ade26.tar.gz frameworks_base-4209a28270a70016ee5ee6cae3dc96d6df0ade26.tar.bz2 | |
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
Diffstat (limited to 'telecomm/java/android/telecom')
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 22b7bb1..6fa653d 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -223,7 +223,7 @@ public final class Call { //********************************************************************************************** // Next CAPABILITY value: 0x00080000 - //********************************************************************************************** + //****************************************************************************************** private final Uri mHandle; private final int mHandlePresentation; @@ -323,7 +323,7 @@ public final class Call { 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(); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index a335e47..082474b 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -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(); |