Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev

2018-05-16 23:28:28 +00:00
parent e7f321c3c0 1b0afb9d1c
commit d924894652
2 changed files with 15 additions and 3 deletions
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -131,7 +131,8 @@ public class TetherPreferenceController extends AbstractPreferenceController imp

    @Override
    public void onCreate(Bundle savedInstanceState) {
-        if (mBluetoothAdapter != null) {
+        if (mBluetoothAdapter != null &&
+            mBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
            mBluetoothAdapter.getProfileProxy(mContext, mBtProfileServiceListener,
                    BluetoothProfile.PAN);
        }