commit 32dfc1c919bc953808e5791cd19040755e692eb1
author Dave Langemak <dlangemak@google.com> Wed Oct 08 14:35:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 08 14:35:02 2014 +0000
tree 1f10576f683efdc10b41662cd907241d32dcc7cf
parent 0482295909da597068f093802a7f39e279b44e23
parent 52bc81b8599f38cffb42ddf24adf9957b8ad46a9

Merge "Always initialize CDMA OTA state" into lmp-dev

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

diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index 5d470ab..1915fe0 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -79,7 +79,6 @@
             EmergencyTonePlayer emergencyTonePlayer,
             boolean allowMute,
             boolean isOutgoing) {
-
         super(connection);
         mEmergencyTonePlayer = emergencyTonePlayer;
         mAllowMute = allowMute;

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 f7c6510..1cc6ad6 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -387,7 +387,7 @@
         setVideoProvider(mOriginalConnection.getVideoProvider());
         setAudioQuality(mOriginalConnection.getAudioQuality());
 
-        updateState();
+        updateAddress();
     }
 
     protected void hangup(int telephonyDisconnectCode) {
@@ -485,7 +485,7 @@
         return true;
     }
 
-    protected void updateState() {
+    void updateState() {
         if (mOriginalConnection == null) {
             return;
         }

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

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index e3b78d4..e8c148a 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -278,14 +278,14 @@
             return Connection.createCanceledConnection();
         }
 
-        Connection connection =
+        TelephonyConnection connection =
                 createConnectionFor(phone, unknownConnection,
                         !unknownConnection.isIncoming() /* isOutgoing */);
 
         if (connection == null) {
-            connection = Connection.createCanceledConnection();
             return Connection.createCanceledConnection();
         } else {
+            connection.updateState();
             return connection;
         }
     }