resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp

Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
2016-06-13 13:01:36 -07:00
parent 8532049946 b34cf8647f
commit 89b8babe6a
1 changed files with 7 additions and 0 deletions
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -199,6 +199,13 @@ public class TetherSettings extends RestrictedSettingsFragment
    @Override
    public void onDestroy() {
        mDataSaverBackend.remListener(this);
+
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        BluetoothProfile profile = mBluetoothPan.getAndSet(null);
+        if (profile != null && adapter != null) {
+            adapter.closeProfileProxy(BluetoothProfile.PAN, profile);
+        }
+
        super.onDestroy();
    }