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

Commit 7ffb433c authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by android-build-merger
Browse files

Merge "Don't assume SYSTEM is current user on boot" into qt-r1-dev 

am: 53496f6f

Change-Id: I3a901d6992505f6a8b4c07fdbfe27f13d1598b0a
parents 97089c67 53496f6f

services/core/java/com/android/server/LocationManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -466,7 +466,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
        // the user being changed will cause a reload of all user specific settings, which causes

        // the user being changed will cause a reload of all user specific settings, which causes

        // provider initialization, and propagates changes until a steady state is reached

        // provider initialization, and propagates changes until a steady state is reached

        mCurrentUserId = UserHandle.USER_NULL;

        mCurrentUserId = UserHandle.USER_NULL;

        onUserChangedLocked(UserHandle.USER_SYSTEM);

        onUserChangedLocked(ActivityManager.getCurrentUser());





        // initialize in-memory settings values

        // initialize in-memory settings values

        onBackgroundThrottleWhitelistChangedLocked();

        onBackgroundThrottleWhitelistChangedLocked();