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

Merge "Block user from setting safe boot setting via adb" into nyc-dev

Browse Source
This commit is contained in:
Benjamin Franz
2016-07-22 08:37:30 +00:00
committed by Android (Google) Code Review
parent adfb20c2f0 0ff13fce6f
commit f97faada5d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -1202,6 +1202,11 @@ public class SettingsProvider extends ContentProvider {
restriction = UserManager.DISALLOW_CONFIG_VPN; restriction = UserManager.DISALLOW_CONFIG_VPN;
break; break;
case Settings.Global.SAFE_BOOT_DISALLOWED:
if ("1".equals(value)) return false;
restriction = UserManager.DISALLOW_SAFE_BOOT;
break;
default: default:
if (setting != null && setting.startsWith(Settings.Global.DATA_ROAMING)) { if (setting != null && setting.startsWith(Settings.Global.DATA_ROAMING)) {
if ("0".equals(value)) return false; if ("0".equals(value)) return false;

3
services/core/java/com/android/server/pm/UserRestrictionsUtils.java
View File

@@ -330,6 +330,9 @@ public class UserRestrictionsUtils {
// set, and in that case even if the restriction is lifted, changing it to ON would be // set, and in that case even if the restriction is lifted, changing it to ON would be
// wrong. So just don't do anything in such a case. If the user hopes to enable location // wrong. So just don't do anything in such a case. If the user hopes to enable location
// later, they can do it on the Settings UI. // later, they can do it on the Settings UI.
// WARNING: Remember that Settings.Global and Settings.Secure are changeable via adb.
// To prevent this from happening for a given user restriction, you have to add a check to
// SettingsProvider.isGlobalOrSecureSettingRestrictedForUser.
final ContentResolver cr = context.getContentResolver(); final ContentResolver cr = context.getContentResolver();
final long id = Binder.clearCallingIdentity(); final long id = Binder.clearCallingIdentity();