Merge "Bluetooth Settings Policy Transparency"

2017-07-14 09:51:14 +00:00
parent c57fa7f90c df4bb2a84f
commit 036304f32d
2 changed files with 24 additions and 3 deletions
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -106,7 +106,7 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
            mContext = context;
        }

-        maybeEnforceRestrictions();
+        final boolean restricted = maybeEnforceRestrictions();

        if (mLocalAdapter == null) {
            mSwitchWidget.setEnabled(false);
@@ -114,7 +114,9 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
        }

        // Bluetooth state is not sticky, so set it manually
-        handleStateChanged(mLocalAdapter.getBluetoothState());
+        if (!restricted) {
+            handleStateChanged(mLocalAdapter.getBluetoothState());
+        }

        mSwitchWidget.startListening();
        mContext.registerReceiver(mReceiver, mIntentFilter);