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

Commit 1845deb0 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: I2cfebb8599c8ae97993511c3b0b30b52c5135d82
parents 447c7f4c bc428861

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;