commit cabac5e24e45eadb46f93a0fa9d5c6d72bd06dc7
author Sanket Padawe <sanketpadawe@google.com> Mon Jul 25 22:38:02 2016 +0000
committer Sanket Padawe <sanketpadawe@google.com> Mon Jul 25 22:38:02 2016 +0000
tree f5d3b77f2861074d311e0c5230d8b181326411ac
parent 1e68844eadc6a03c2e4f4a73bd937d2e45ddc0a2

Revert "Fix bug which displays "conf-factory.." string in dialer app."

This reverts commit 1e68844eadc6a03c2e4f4a73bd937d2e45ddc0a2.

Change-Id: I4974fa654ed53ea1038f56d958d065c1bf1c0e30

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 a65e9db..7354b10 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -89,8 +89,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) {
@@ -710,9 +708,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);
             }