Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I127f4fe9b8c96f9d8cf71c7c31bbf7eac77599a5
This commit is contained in:
TreeHugger Robot
2020-04-08 06:40:42 +00:00
committed by Automerger Merge Worker
parent 4d3779d8b3 b4f21a59fe
commit 306ca2f852
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
View File

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