Merge "Merge "Support NLP request pierce location setting in emergency mode"... (096cde61) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/gnss/GnssLocationProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -809,11 +809,11 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		locationRequest.setProvider(provider);

		// Ignore location settings if in emergency mode. This is only allowed for
		// isUserEmergency request (introduced in HAL v2.0), or DBH request in HAL v1.1.
		// isUserEmergency request (introduced in HAL v2.0), or HAL v1.1.
		if (mNIHandler.getInEmergency()) {
		GnssConfiguration.HalInterfaceVersion halVersion =
		mGnssConfiguration.getHalInterfaceVersion();
		if (isUserEmergency \|\| (halVersion.mMajor < 2 && !independentFromGnss)) {
		if (isUserEmergency \|\| halVersion.mMajor < 2) {
		locationRequest.setLocationSettingsIgnored(true);
		durationMillis *= EMERGENCY_LOCATION_UPDATE_DURATION_MULTIPLIER;
		}