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

Commit e699079b authored by Tyler Trephan's avatar Tyler Trephan Committed by android-build-merger
Browse files

Merge "Merge "Fixes multiuser GNSS Bug." into qt-dev am: bc428861 am:... 

Merge "Merge "Fixes multiuser GNSS Bug." into qt-dev am: bc428861 am: fed72e82" into qt-r1-dev-plus-aosp
am: 14c143af

Change-Id: Ia6daf6eb1e855a9de5e8ba41e7d199ceff0a7ac9
parents f01922db 14c143af

services/core/java/com/android/server/location/GnssLocationProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -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;