commit 0ce03e77bc58cccb083ec0d98bb1516db6a1523e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 13 20:15:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 13 20:15:31 2016 +0000
tree 654982587169486c5969ebffb4e171d51e635fce
parent 6eefe67b2cf4785b53ea687bba8080c3b2230ee4
parent db8c1dbc5ec2a09c9c79f79e2cfb2f71c17b9df6

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

services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java

diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
index 855a2b6..23ffb18 100644
--- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
@@ -328,6 +328,7 @@
         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(),