PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a

Browse Source 
am: 69118dc9b1

Change-Id: I99d1b094d3de31905d1a72636146794c5ff00334
This commit is contained in:
Robert Greenwalt
2016-06-13 20:14:29 +00:00
committed by android-build-merger
parent 415da00e36 69118dc9b1
commit 1bd411f64a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/TetherSettings.java
View File

@@ -199,6 +199,13 @@ public class TetherSettings extends RestrictedSettingsFragment
@Override @Override
public void onDestroy() { public void onDestroy() {
mDataSaverBackend.remListener(this); mDataSaverBackend.remListener(this);
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
BluetoothProfile profile = mBluetoothPan.getAndSet(null);
if (profile != null && adapter != null) {
adapter.closeProfileProxy(BluetoothProfile.PAN, profile);
}
super.onDestroy(); super.onDestroy();
} }