Merge "Restricts driver assistance location bypass to current user." (1af6550e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/provider/LocationProviderManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -661,6 +661,8 @@ public class LocationProviderManager extends
		if (!GPS_PROVIDER.equals(mName)) {
		Log.e(TAG, "adas gnss bypass request received in non-gps provider");
		adasGnssBypass = false;
		} else if (!mUserHelper.isCurrentUserId(getIdentity().getUserId())) {
		adasGnssBypass = false;
		} else if (!mLocationSettings.getUserSettings(
		getIdentity().getUserId()).isAdasGnssLocationEnabled()) {
		adasGnssBypass = false;
		@@ -1712,6 +1714,8 @@ public class LocationProviderManager extends
		if (!GPS_PROVIDER.equals(mName)) {
		Log.e(TAG, "adas gnss bypass request received in non-gps provider");
		adasGnssBypass = false;
		} else if (!mUserHelper.isCurrentUserId(identity.getUserId())) {
		adasGnssBypass = false;
		} else if (!mLocationSettings.getUserSettings(
		identity.getUserId()).isAdasGnssLocationEnabled()) {
		adasGnssBypass = false;