Merge \"Disallowing bluetooth config for demo users\" into nyc-mr1-dev

am: 0ce03e77bc

Change-Id: I89d396d0450c241fc1314cd8320ed2c6d02b9823
This commit is contained in:
Suprabh Shukla
2016-07-13 20:27:46 +00:00
committed by android-build-merger

View File

@@ -328,6 +328,7 @@ public class RetailDemoModeService extends SystemService {
um.setUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, true, user);
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);
Settings.Secure.putIntForUser(getContext().getContentResolver(),
Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id);
Settings.Secure.putIntForUser(getContext().getContentResolver(),