| commit | 9f401d66a657609bef65c3e65b29602eef130c0b | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Wed Aug 31 17:38:51 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 31 17:38:52 2016 +0000 |
| tree | cbeb81034768a4cd071969b7b4273c3ab35a883d | |
| parent | 3b758788e8dfeef317010c7fb846fb082275fdfe [diff] | |
| parent | 6b5f71100ef5d656e31dcaf267878b17bccbadf4 [diff] |
Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java index 7ad37b0..ac117b3 100644 --- a/src/com/android/services/telephony/TelephonyConnection.java +++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -738,7 +738,7 @@ // shown. Phone phone = getPhone(); if (phone != null && phone.isInEcm()) { - connectionProperties |= PROPERTY_SHOW_CALLBACK_NUMBER; + connectionProperties |= PROPERTY_EMERGENCY_CALLBACK_MODE; } return connectionProperties;