Merge tag 'android-5.1.1_r2' into aosp-5.1

Android 5.1.1 release 2
F-AOSP · May 11, 2015 · 7edfbb3 · 7edfbb3
2 parents 1421199 + 610bafc
commit 7edfbb3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/java/com/android/internal/telephony/CallManager.java b/src/java/com/android/internal/telephony/CallManager.java
@@ -440,10 +440,11 @@ public void unregisterPhone(Phone phone) {
                         phone.getPhoneName() + " " + phone + ")");
             }
 
-            Phone vPhone = basePhone.getImsPhone();
-            if (vPhone != null) {
-               unregisterPhone(vPhone);
-            }
+            // ImsPhone is unregistered in PhoneBase.updateImsPhone()
+            //Phone vPhone = basePhone.getImsPhone();
+            //if (vPhone != null) {
+            //   unregisterPhone(vPhone);
+            //}
 
             mPhones.remove(basePhone);
             mRingingCalls.remove(basePhone.getRingingCall());

diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java
@@ -220,7 +220,7 @@ protected static class NetworkSelectMessage {
 
     private final Object mImsLock = new Object();
     private boolean mImsServiceReady = false;
-    protected ImsPhone mImsPhone = null;
+    protected static ImsPhone mImsPhone = null;
 
     protected int mRadioAccessFamily = RadioAccessFamily.RAF_UNKNOWN;
 
@@ -460,11 +460,12 @@ public void dispose() {
                 mTelephonyTester.dispose();
             }
 
-            ImsPhone imsPhone = mImsPhone;
-            if (imsPhone != null) {
-                imsPhone.unregisterForSilentRedial(this);
-                imsPhone.dispose();
-            }
+            // No deed to dispose static object
+            //ImsPhone imsPhone = mImsPhone;
+            //if (imsPhone != null) {
+            //    imsPhone.unregisterForSilentRedial(this);
+            //    imsPhone.dispose();
+            //}
         }
     }
 

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
@@ -190,6 +190,11 @@ public void dispose() {
         //Force all referenced classes to unregister their former registered events
     }
 
+    @Override
+    public Phone getImsPhone() {
+        return null;
+    }
+
     @Override
     public void removeReferences() {
         Rlog.d(LOG_TAG, "removeReferences");