Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17aa1547 authored by Benjamin Franz's avatar Benjamin Franz Committed by Jessica Wagantall
Browse files

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.

CYNGNOS-3235
Bug: 26251884
Change-Id: I4945d5d676928346c11ea305a5b6a2e1a42e94e6
(cherry picked from commit 7fbb93d4)
(cherry picked from commit 7687ee10)
parent e513215f

services/core/java/com/android/server/wm/WindowManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -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;
@@ -7666,6 +7667,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);