Merge "Fixes multiuser GNSS Bug." into qt-dev

2019-05-20 20:19:38 +00:00
parent 4a58ec22e1 037ef9d58a
commit bc42886132
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -966,8 +966,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
    }

    private void updateEnabled() {
-        // Generally follow location setting
-        boolean enabled = mContext.getSystemService(LocationManager.class).isLocationEnabled();
+        // Generally follow location setting for current user
+        boolean enabled = mContext.getSystemService(LocationManager.class)
+                .isLocationEnabledForUser(UserHandle.CURRENT);

        // ... but disable if PowerManager overrides
        enabled &= !mDisableGpsForPowerManager;