commit 6fa65e6b7f690474985686d01d46b976c1b2753f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 26 00:03:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 26 00:03:42 2016 +0000
tree 7d24ebc7f5ebbb4835e4526efea89080428fa582
parent 5730dfd1900ee0f96ca394b93fe0333d3ca6bcb9
parent cabac5e24e45eadb46f93a0fa9d5c6d72bd06dc7

Merge "Revert "Fix bug which displays "conf-factory.." string in dialer app."" into nyc-mr1-dev

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 6cb6488..b6bbcac 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -92,8 +92,6 @@
     private static final int MSG_CDMA_VOICE_PRIVACY_ON = 15;
     private static final int MSG_CDMA_VOICE_PRIVACY_OFF = 16;
 
-    private static final String CONF_CALL_SUBSTRING = "conf-factory";
-
     private final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -750,9 +748,6 @@
             if (!Objects.equals(address, getAddress()) ||
                     presentation != getAddressPresentation()) {
                 Log.v(this, "updateAddress, address changed");
-                if (address != null && address.toString().contains(CONF_CALL_SUBSTRING)) {
-                    address = null;
-                }
                 setAddress(address, presentation);
             }