commit 82de3006bdb140040da8ceeac41712a2ac9dcb87
author Makoto Onuki <omakoto@google.com> Fri Sep 30 09:58:15 2016 -0700
committer Makoto Onuki <omakoto@google.com> Fri Sep 30 10:16:56 2016 -0700
tree 48340ebc8741dc9de753da326550fbf8173a880f
parent c83f46dc834bd7342ab2be98f34889460ce74be4

Fix DO user restrictions persisting in UMS

<device_policy_restrictions> was *not* written in <guestRestrictions>.

<guestRestrictions>
    <restrictions no_sms="true" />
</guestRestrictions>
<device_policy_restrictions no_fun="true" no_adjust_volume="true" />

Fix the loading code.

Test: Manually set DO/PO restrictions, rebooted the device and checked with
dumpsys.

Bug 30949168

Change-Id: I8708a0b716852e3d981d2fe866f6628c0df80dcb

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index c6b09d1..533d9b5 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1706,14 +1706,13 @@
                                         UserRestrictionsUtils
                                                 .readRestrictions(parser, mGuestRestrictions);
                                     }
-                                } else if (parser.getName().equals(TAG_DEVICE_POLICY_RESTRICTIONS)
-                                        ) {
-                                    UserRestrictionsUtils.readRestrictions(parser,
-                                            newDevicePolicyGlobalUserRestrictions);
                                 }
                                 break;
                             }
                         }
+                    } else if (name.equals(TAG_DEVICE_POLICY_RESTRICTIONS)) {
+                        UserRestrictionsUtils.readRestrictions(parser,
+                                newDevicePolicyGlobalUserRestrictions);
                     } else if (name.equals(TAG_GLOBAL_RESTRICTION_OWNER_ID)) {
                         String ownerUserId = parser.getAttributeValue(null, ATTR_ID);
                         if (ownerUserId != null) {