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

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

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

am: bc428861

Change-Id: I24a864630ad321b037788268132a2e951582c54c
parents 75e5a38a bc428861

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -966,8 +966,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
    }

    }





    private void updateEnabled() {

    private void updateEnabled() {

        // Generally follow location setting

        // Generally follow location setting for current user

        boolean enabled = mContext.getSystemService(LocationManager.class).isLocationEnabled();

        boolean enabled = mContext.getSystemService(LocationManager.class)

                .isLocationEnabledForUser(UserHandle.CURRENT);





        // ... but disable if PowerManager overrides

        // ... but disable if PowerManager overrides

        enabled &= !mDisableGpsForPowerManager;

        enabled &= !mDisableGpsForPowerManager;