From 0744e2fa2e1cf851646072c658a598e43da71ee9 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Fri, 12 Jul 2019 09:56:26 -0700
Subject: [PATCH] Don't assume SYSTEM is current user on boot

Auto and chrome can apparently use different users at boot.

Bug: 137204067
Test: manual
Change-Id: I61371bcc167a39e6344fe457dca56f0003910ce8
(cherry picked from commit db49bea1532a87639368084c1a6ee6266e721fbb)
---
 .../core/java/com/android/server/LocationManagerService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 8a639c543366d..90e467034e6a7 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -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
         // 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();