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

Browse Source 
am: 89b8babe6a

Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c
This commit is contained in:
宋凯伦
2016-06-13 20:10:42 +00:00
committed by android-build-merger
parent fe91143d71 89b8babe6a
commit 69118dc9b1
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();
} }