diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-12 15:20:47 +0100 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-07-22 16:17:55 -0700 |
| commit | 546b1a9cf8aa776e186882c59bb5dd66bd571269 (patch) | |
| tree | 2012444caca68bccbe5a7ceba87cd929af35672a | |
| parent | f28516b601dcd17efc1d39ce8a161ef559a05484 (diff) | |
| download | base-546b1a9cf8aa776e186882c59bb5dd66bd571269.tar.gz | |
DO NOT MERGE Block the user from entering safe boot mode
Block the user from entering safe boot mode if the DISALLOW_SAFE_BOOT
policy is set.
Bug: 26251884
Change-Id: I4945d5d676928346c11ea305a5b6a2e1a42e94e6
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 71bbdb6761b3..d695d936b0d4 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -65,6 +65,7 @@ import android.os.SystemProperties; import android.os.SystemService; import android.os.Trace; import android.os.UserHandle; +import android.os.UserManager; import android.os.WorkSource; import android.provider.Settings; import android.util.ArraySet; @@ -7613,6 +7614,12 @@ public class WindowManagerService extends IWindowManager.Stub + " milliseconds before attempting to detect safe mode."); } + UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE); + if (um != null && um.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) { + mSafeMode = false; + return false; + } + int menuState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY, KeyEvent.KEYCODE_MENU); int sState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY, KeyEvent.KEYCODE_S); |