commit 0b72917dcfdc3dec68ab05a13c85321f0e3cc804
author Pengquan Meng <mpq@google.com> Thu Oct 04 15:20:51 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 04 15:20:51 2018 -0700
tree d8aecb964aa1ab7813ae75ac9ec236da8ba44c36
parent 5692c6e14eced9596df2556bf3610fa09dfa3361
parent d72edcb69abdfdab6433bc22a7cb7b9de7e406dc

Merge "Fix binder leakage and activity leakage in MobileNetworkSettings." am: ae6dac9126
am: d72edcb69a

Change-Id: Iaa83964117e51f5d19dfa37c9625526d2fd91b78

src/com/android/phone/MobileDataPreference.java

diff --git a/src/com/android/phone/MobileDataPreference.java b/src/com/android/phone/MobileDataPreference.java
index 4e82f20..e1ceab0 100644
--- a/src/com/android/phone/MobileDataPreference.java
+++ b/src/com/android/phone/MobileDataPreference.java
@@ -63,6 +63,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 8b49d17..5d90258 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -947,8 +947,11 @@
 
         @Override
         public void onDestroy() {
-            unbindNetworkQueryService();
             super.onDestroy();
+            unbindNetworkQueryService();
+            if (mMobileDataPref != null) {
+                mMobileDataPref.dispose();
+            }
         }
 
         @Override