From 4e416e9f0c5b8a6622afa38c637537ca59c2655f Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Wed, 13 Jul 2016 11:33:09 -0700 Subject: [PATCH] Disallow safe boot when in demo mode Bug: 30038636 Change-Id: I70624bff85f5fb012772422f0fff523dab6e9be1 --- .../com/android/server/retaildemo/RetailDemoModeService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java index 23ffb182da470..7ec2097c69bc3 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java +++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java @@ -329,6 +329,9 @@ public class RetailDemoModeService extends SystemService { um.setUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER, true, user); um.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user); um.setUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH, true, user); + // Disallow rebooting in safe mode - controlled by user 0 + getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT, true, + UserHandle.SYSTEM); Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id); Settings.Secure.putIntForUser(getContext().getContentResolver(),