Merge \"Fix the memory leak in TetherSettings\"

am: 03393c4109 Change-Id: Iec6e2b02efe28491c988a530f401350f8ee5b52f
2016-06-13 18:46:19 +00:00
parent 9e28f9a7f7 03393c4109
commit b34cf8647f
1 changed files with 10 additions and 0 deletions
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -182,6 +182,16 @@ public class TetherSettings extends SettingsPreferenceFragment
                com.android.internal.R.array.config_mobile_hotspot_provision_app);
    }

+    @Override
+    public void onDestroy() {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        BluetoothProfile profile = mBluetoothPan.getAndSet(null);
+        if (profile != null && adapter != null) {
+            adapter.closeProfileProxy(BluetoothProfile.PAN, profile);
+        }
+        super.onDestroy();
+    }
+
    @Override
    public void onSaveInstanceState(Bundle savedInstanceState) {
        savedInstanceState.putInt(TETHER_CHOICE, mTetherChoice);