commit 32fa38e023620c032c53e95f6936717a4bcd68b9
author Geoff Mendal <mendal@google.com> Mon Mar 09 14:28:54 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 14:28:55 2015 +0000
tree 8ca64f68e895eec01df0b08e9d958908dcc6f4cf
parent 7d3db0dd28e6b99077568d37618a8fa44d6076f7
parent 8b25d04d323d85240627af066c9453e7f0bc215f

Merge "Import translations. DO NOT MERGE"

src/com/android/managedprovisioning/PreBootListener.java

diff --git a/src/com/android/managedprovisioning/PreBootListener.java b/src/com/android/managedprovisioning/PreBootListener.java
index b984fe1..692dbec 100644
--- a/src/com/android/managedprovisioning/PreBootListener.java
+++ b/src/com/android/managedprovisioning/PreBootListener.java
@@ -95,6 +95,9 @@
                 continue;
             }
 
+            // always set the DISALLOW_WALLPAPER user restriction
+            um.setUserRestriction(UserManager.DISALLOW_WALLPAPER, true, userInfo.getUserHandle());
+
             final DeleteNonRequiredAppsTask deleteNonRequiredAppsTask;
             final DisableInstallShortcutListenersTask disableInstallShortcutListenersTask;
 

src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java

diff --git a/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java b/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java
index e7d22f2..0c538f9 100644
--- a/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java
+++ b/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java
@@ -333,6 +333,7 @@
         installMdmOnManagedProfile();
         setMdmAsActiveAdmin();
         setMdmAsManagedProfileOwner();
+        setDefaultUserRestrictions();
         CrossProfileIntentFiltersHelper.setFilters(
                 getPackageManager(), getUserId(), mManagedProfileUserInfo.id);
 
@@ -619,6 +620,11 @@
         }
     }
 
+    private void setDefaultUserRestrictions() {
+        mUserManager.setUserRestriction(UserManager.DISALLOW_WALLPAPER, true,
+                mManagedProfileUserInfo.getUserHandle());
+    }
+
     private void notifyActivityError() {
         Intent intent = new Intent(ACTION_PROVISIONING_ERROR);
         intent.putExtra(EXTRA_LOG_MESSAGE_KEY, mLastErrorMessage);