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

am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev

Browse Source 
* commit '99ad06c2a15200cfd83da7cf2131c8127f55544c':
  Change the location mode before applying restrictions
This commit is contained in:
Amith Yamasani
2014-09-03 16:42:29 +00:00
committed by Android Git Automerger
parent 43454701c6 99ad06c2a1
commit 12997ecd97
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/UserSettings.java
View File

@@ -418,9 +418,11 @@ public class UserSettings extends SettingsPreferenceFragment
int userId = newUserInfo.id; int userId = newUserInfo.id;
UserHandle user = new UserHandle(userId); UserHandle user = new UserHandle(userId);
mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user); mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user);
mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, user); // Change the setting before applying the DISALLOW_SHARE_LOCATION restriction, otherwise
// the putIntForUser() will fail.
Secure.putIntForUser(getContentResolver(), Secure.putIntForUser(getContentResolver(),
Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, userId); Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, userId);
mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, user);
Bitmap bitmap = createBitmapFromDrawable( Bitmap bitmap = createBitmapFromDrawable(
USER_DRAWABLES[userId % UserSettings.USER_DRAWABLES.length]); USER_DRAWABLES[userId % UserSettings.USER_DRAWABLES.length]);
mUserManager.setUserIcon(userId, bitmap); mUserManager.setUserIcon(userId, bitmap);