Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62196a84 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Support NLP request pierce location setting in emergency mode"... 

Merge "Merge "Support NLP request pierce location setting in emergency mode" into rvc-dev am: b4f21a59" into rvc-dev-plus-aosp
parents d7514f17 2c7050f8

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

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

        locationRequest.setProvider(provider);





        // Ignore location settings if in emergency mode. This is only allowed for

        // 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()) {

        if (mNIHandler.getInEmergency()) {

            GnssConfiguration.HalInterfaceVersion halVersion =

            GnssConfiguration.HalInterfaceVersion halVersion =

                    mGnssConfiguration.getHalInterfaceVersion();

                    mGnssConfiguration.getHalInterfaceVersion();

            if (isUserEmergency || (halVersion.mMajor < 2 && !independentFromGnss)) {

            if (isUserEmergency || halVersion.mMajor < 2) {

                locationRequest.setLocationSettingsIgnored(true);

                locationRequest.setLocationSettingsIgnored(true);

                durationMillis *= EMERGENCY_LOCATION_UPDATE_DURATION_MULTIPLIER;

                durationMillis *= EMERGENCY_LOCATION_UPDATE_DURATION_MULTIPLIER;

            }

            }