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

Commit f7496d7e authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Don't update user's setup state unless it changed" into lmp-dev

parents 1968201b 0da218be

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −3
Original line number Diff line number Diff line
@@ -4291,6 +4291,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            if (Settings.Secure.getIntForUser(resolver, Settings.Secure.USER_SETUP_COMPLETE, 0,

                    userHandle) != 0) {

                DevicePolicyData policy = getUserData(userHandle);

                if (!policy.mUserSetupComplete) {

                    policy.mUserSetupComplete = true;

                    synchronized (this) {

                        saveSettingsLocked(userHandle);
@@ -4298,6 +4299,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                }

            }

        }

    }



    private class SetupContentObserver extends ContentObserver {