diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java index a2b001da78f29..7063cb80d514a 100644 --- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java +++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java @@ -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;