commit 457bb17d5acc9d2e92b62ef2c562f9ab9f6d5af2
author Malcolm Chen <refuhoo@google.com> Wed Jun 06 20:20:53 2018 -0700
committer Xiangyu/Malcolm Chen <refuhoo@google.com> Wed Jun 13 22:47:00 2018 +0000
tree 7311c9835de50995e8e10c58d629eb9217600f8e
parent 1a1b43be8240cf706caf2e9f1b2764a2db0b131f

Fix binder leakage and activity leakage in MobileNetworkSettings.

There's a binder leakage in MobileDataPreference. Its contentObserver
was only unregistered in onPrepareForRemoval, which is not called when
the activity is destroyed. So adding dispose API to make sure it's
unregistered.

Bug: 80275945
Test: unittest and stress test
Change-Id: Iaa447b46474a2235487aac3c200bba45924e5121

src/com/android/phone/MobileDataPreference.java

diff --git a/src/com/android/phone/MobileDataPreference.java b/src/com/android/phone/MobileDataPreference.java
index 38d700e..8763b77 100644
--- a/src/com/android/phone/MobileDataPreference.java
+++ b/src/com/android/phone/MobileDataPreference.java
@@ -60,6 +60,11 @@
         super(context, attrs, com.android.internal.R.attr.switchPreferenceStyle);
     }
 
+    // Must be called to avoid binder leakage.
+    void dispose() {
+        mListener.setListener(false, mSubId, getContext());
+    }
+
     @Override
     protected void onRestoreInstanceState(Parcelable s) {
         CellDataState state = (CellDataState) s;

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 6a26f76..1301c8b 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -842,8 +842,11 @@
 
         @Override
         public void onDestroy() {
-            unbindNetworkQueryService();
             super.onDestroy();
+            unbindNetworkQueryService();
+            if (mMobileDataPref != null) {
+                mMobileDataPref.dispose();
+            }
         }
 
         @Override