commit b4f21a59fe58f69d0d8dca0bd6a27e6562882f4e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 08 06:29:57 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 08 06:29:57 2020 +0000
tree 70fffd0a97a8cf9dcc5be094a3f0d6514ed54515
parent c88b779af9fda552d9040b069772fae3217916f6
parent 311a9093479f0625f5c47a5ce8559ed91bffcb09

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

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

diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index ad3c8a6..d8acf0e 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -809,11 +809,11 @@
         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;
             }