commit 00768c460bdc605f5ec91377c59659be5f75e6a9
author Hall Liu <hallliu@google.com> Fri Jul 22 17:49:27 2016 -0700
committer Hall Liu <hallliu@google.com> Tue Jul 26 14:53:14 2016 -0700
tree 7c4fa537c8a8074d8567b635a5a2c2b583314325
parent 6fa65e6b7f690474985686d01d46b976c1b2753f

Persist SRVCC-related properties in GsmConnection

Makes sure that PROPERTY_IS_DOWNGRADED_CONFERENCE and
CAPABILITY_CONFERENCE_HAS_NO_CHILDREN are not erased when
updateConnectionProperties and updateConnectionCapabilities are called.

Bug: 29806833
Change-Id: Id8e3a81845df0bc144a040c68709db111f467473

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

diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index eec0951..c480baa 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java
@@ -57,6 +57,17 @@
     }
 
     @Override
+    protected int buildConnectionProperties() {
+        int properties = super.buildConnectionProperties();
+        // PROPERTY_IS_DOWNGRADED_CONFERENCE is permanent on GSM connections -- once it is set, it
+        // should be retained.
+        if ((getConnectionProperties() & PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0) {
+            properties |= PROPERTY_IS_DOWNGRADED_CONFERENCE;
+        }
+        return properties;
+    }
+
+    @Override
     protected int buildConnectionCapabilities() {
         int capabilities = super.buildConnectionCapabilities();
         capabilities |= CAPABILITY_MUTE;
@@ -69,6 +80,13 @@
                 capabilities |= CAPABILITY_HOLD;
             }
         }
+
+        // For GSM connections, CAPABILITY_CONFERENCE_HAS_NO_CHILDREN should be applied whenever
+        // PROPERTY_IS_DOWNGRADED_CONFERENCE is true.
+        if ((getConnectionProperties() & PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0) {
+            capabilities |= CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
+        }
+
         return capabilities;
     }
 

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 b6bbcac..241d54c 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -748,6 +748,9 @@
             if (!Objects.equals(address, getAddress()) ||
                     presentation != getAddressPresentation()) {
                 Log.v(this, "updateAddress, address changed");
+                if ((getConnectionProperties() & PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0) {
+                    address = null;
+                }
                 setAddress(address, presentation);
             }