Merge "Merge "Fixes multiuser GNSS Bug." into qt-dev am: bc42886132 am:... (14c143af) · Commits · e / os / android_frameworks_base

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;