PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use UM.setUserRestrictions() in Settings

Browse Source 
Change-Id: I014fe939f3495521a813eadbb7353956afc3feb4
This commit is contained in:
Makoto Onuki
2015-10-15 14:20:03 -07:00
parent 5c59606e7c
commit b761ad1c6e
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/users/RestrictionUtils.java
View File

@@ -78,16 +78,17 @@ public class RestrictionUtils {
public static void setRestrictions(Context context, ArrayList<RestrictionEntry> entries,
UserHandle user) {
UserManager um = UserManager.get(context);
Bundle userRestrictions = um.getUserRestrictions(user);
for (RestrictionEntry entry : entries) {
userRestrictions.putBoolean(entry.getKey(), !entry.getSelectedState());
um.setUserRestriction(entry.getKey(), !entry.getSelectedState());
// TODO This will no longer be needed once b/23902097 is fixed. um.setUserRestriction
// should do it.
if (entry.getKey().equals(UserManager.DISALLOW_SHARE_LOCATION)
&& !entry.getSelectedState()) {
Secure.putIntForUser(context.getContentResolver(),
Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, user.getIdentifier());
}
}
um.setUserRestrictions(userRestrictions, user);
}
}