diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-04-29 08:35:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 08:36:00 +0000 |
| commit | c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b (patch) | |
| tree | fa2f4dfed3824816465c6dc567aea07e0fb487f7 /services/devicepolicy/java/com/android | |
| parent | 25466e0a8f3e0f7f1e758642519f3aa8643f6f26 (diff) | |
| parent | 27cf146361125d1233c487ec215d5d794f5dde17 (diff) | |
| download | frameworks_base-c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b.zip frameworks_base-c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b.tar.gz frameworks_base-c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b.tar.bz2 | |
Merge "Add status bar flag to disable quick settings" into mnc-dev
Diffstat (limited to 'services/devicepolicy/java/com/android')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 1d00de9..f801d2d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -192,6 +192,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { StatusBarManager.DISABLE_NOTIFICATION_ALERTS | StatusBarManager.DISABLE_SEARCH; + private static final int STATUS_BAR_DISABLE2_MASK = + StatusBarManager.DISABLE2_QUICK_SETTINGS; + private static final Set<String> DEVICE_OWNER_USER_RESTRICTIONS; static { DEVICE_OWNER_USER_RESTRICTIONS = new HashSet(); @@ -6040,8 +6043,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { IStatusBarService statusBarService = IStatusBarService.Stub.asInterface( ServiceManager.checkService(Context.STATUS_BAR_SERVICE)); if (statusBarService != null) { - int flags = enabled ? StatusBarManager.DISABLE_NONE : STATUS_BAR_DISABLE_MASK; - statusBarService.disableForUser(flags, mToken, mContext.getPackageName(), userId); + int flags1 = enabled ? StatusBarManager.DISABLE_NONE : STATUS_BAR_DISABLE_MASK; + int flags2 = enabled ? StatusBarManager.DISABLE2_NONE : STATUS_BAR_DISABLE2_MASK; + statusBarService.disableForUser(flags1, mToken, mContext.getPackageName(), userId); + statusBarService.disable2ForUser(flags2, mToken, mContext.getPackageName(), userId); } } catch (RemoteException e) { Slog.e(LOG_TAG, "Failed to disable the status bar", e); |