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

Commit 2c7050f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support NLP request pierce location setting in emergency mode" into rvc-dev am: b4f21a59 

Change-Id: I32acbd67724c7a0146cad8c739711b5a696d03d0
parents 98e98eaa b4f21a59

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;

            }

            }