| commit | bd8d0332bfa2650d516f391ea41b243a74d5138e | [log] [tgz] |
|---|---|---|
| author | phweiss <phweiss@google.com> | Mon Jun 12 11:38:09 2017 +0200 |
| committer | phweiss <phweiss@google.com> | Tue Jul 11 16:13:58 2017 +0200 |
| tree | 87cef72f09ac58fe1e5e0a16952e3055d5089c96 | |
| parent | f1a04f3f33413d0fd10b207a278563d9093fbd79 [diff] [blame] |
Skip empty bluetooth-page in QS when bluetooth is disallowed If DISALLOW_BLUETOOTH is set, tapping bluetooth in QS used to open the empty device-selection screen with an untoggable switch. Now, it directly brings you to the settings page with policy transparency, mirroring the behaviour of DISALLOW_CONFIG_BLUETOOTH. Bug: 32895313 Test: manual Change-Id: I77230532428a4dd2a7769aa73dcc195c51312c36
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java index dc4b115..fc74952 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -75,6 +75,8 @@ @Override public boolean canConfigBluetooth() { return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH, + UserHandle.of(mCurrentUser)) + && !mUserManager.hasUserRestriction(UserManager.DISALLOW_BLUETOOTH, UserHandle.of(mCurrentUser)); }