Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3

Browse Source 
am: 7abd7ba093

Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
This commit is contained in:
Benjamin Franz
2016-07-21 10:10:03 +00:00
committed by android-build-merger
parent 2331eefef7 7abd7ba093
commit 87534f4ac9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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;
@@ -7607,6 +7608,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);