Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 140563c9 authored by Tom O'Neill's avatar Tom O'Neill Committed by Android (Google) Code Review
Browse files

Merge "Remove some usages of deprecated location APIs"

parents 835c5e4e dad115e2

src/com/android/settings/users/RestrictionUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ public class RestrictionUtils { 
            userRestrictions.putBoolean(entry.getKey(), !entry.getSelectedState());

            if (entry.getKey().equals(UserManager.DISALLOW_SHARE_LOCATION)

                    && !entry.getSelectedState()) {

                Secure.putStringForUser(context.getContentResolver(),

                        Secure.LOCATION_PROVIDERS_ALLOWED, "", user.getIdentifier());

                Secure.putIntForUser(context.getContentResolver(),

                        Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, user.getIdentifier());

            }

        }

        um.setUserRestrictions(userRestrictions, user);

src/com/android/settings/users/UserSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -345,8 +345,8 @@ public class UserSettings extends RestrictedSettingsFragment 
        UserHandle user = new UserHandle(userId);

        mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user);

        mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, user);

        Secure.putStringForUser(getContentResolver(),

                Secure.LOCATION_PROVIDERS_ALLOWED, "", userId);

        Secure.putIntForUser(getContentResolver(),

                Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, userId);

        Bitmap bitmap = BitmapFactory.decodeResource(getResources(),

                UserSettings.USER_DRAWABLES[

                        userId % UserSettings.USER_DRAWABLES.length]);