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

Browse Source 
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
This commit is contained in:
Benjamin Franz
2016-07-21 10:05:33 +00:00
committed by android-build-merger
parent a09b6ee165 3e582390b3
commit 7abd7ba093
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.SystemService;
import android.os.Trace; import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.os.WorkSource; import android.os.WorkSource;
import android.provider.Settings; import android.provider.Settings;
import android.util.ArraySet; import android.util.ArraySet;
@@ -7613,6 +7614,12 @@ public class WindowManagerService extends IWindowManager.Stub
+ " milliseconds before attempting to detect safe mode."); + " 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, int menuState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY,
KeyEvent.KEYCODE_MENU); KeyEvent.KEYCODE_MENU);
int sState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY, KeyEvent.KEYCODE_S); int sState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY, KeyEvent.KEYCODE_S);