Merge "Restricts driver assistance location bypass to current user."

This commit is contained in:
Grace Cheng
2022-11-29 03:59:58 +00:00
committed by Android (Google) Code Review

View File

@@ -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;