commit 53496f6fb35ab0c9b1ebedace2c05e92ca86dc66
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 17 20:53:20 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 17 20:53:20 2019 +0000
tree 9c9fff86c4daefdf8bde070ae988900c80e1e827
parent e03623cee0caab1927518fa60d1737b94e060035
parent 0744e2fa2e1cf851646072c658a598e43da71ee9

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

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

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 8a639c5..90e4670 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -466,7 +466,7 @@
         // 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
         mCurrentUserId = UserHandle.USER_NULL;
-        onUserChangedLocked(UserHandle.USER_SYSTEM);
+        onUserChangedLocked(ActivityManager.getCurrentUser());
 
         // initialize in-memory settings values
         onBackgroundThrottleWhitelistChangedLocked();