resolve merge conflicts of b34cf86
to nyc-dev-plus-aosp
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
This commit is contained in:
@@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user