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

Allow settingIgnored for DBH request if inEmergency am: 97e162d605

Browse Source 
Change-Id: I12cbf0e098f599169392fb4ae7c725d5052b674e
This commit is contained in:
Automerger Merge Worker
2020-02-27 03:35:09 +00:00
parent 55daa202ba 97e162d605
commit 8a1c944d0d
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/location/GnssConfiguration.java
View File

@@ -80,7 +80,7 @@ class GnssConfiguration {
// Represents an HAL interface version. Instances of this class are created in the JNI layer // Represents an HAL interface version. Instances of this class are created in the JNI layer
// and returned through native methods. // and returned through native methods.
private static class HalInterfaceVersion { static class HalInterfaceVersion {
final int mMajor; final int mMajor;
final int mMinor; final int mMinor;
@@ -206,6 +206,10 @@ class GnssConfiguration {
native_set_satellite_blacklist(constellations, svids); native_set_satellite_blacklist(constellations, svids);
} }
HalInterfaceVersion getHalInterfaceVersion() {
return native_get_gnss_configuration_version();
}
interface SetCarrierProperty { interface SetCarrierProperty {
boolean set(int value); boolean set(int value);
} }
@@ -232,8 +236,7 @@ class GnssConfiguration {
logConfigurations(); logConfigurations();
final HalInterfaceVersion gnssConfigurationIfaceVersion = final HalInterfaceVersion gnssConfigurationIfaceVersion = getHalInterfaceVersion();
native_get_gnss_configuration_version();
if (gnssConfigurationIfaceVersion != null) { if (gnssConfigurationIfaceVersion != null) {
// Set to a range checked value. // Set to a range checked value.
if (isConfigEsExtensionSecSupported(gnssConfigurationIfaceVersion) if (isConfigEsExtensionSecSupported(gnssConfigurationIfaceVersion)

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

@@ -807,10 +807,15 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
locationRequest.setProvider(provider); locationRequest.setProvider(provider);
// Ignore location settings if in emergency mode. // Ignore location settings if in emergency mode. This is only allowed for
if (isUserEmergency && mNIHandler.getInEmergency()) { // isUserEmergency request (introduced in HAL v2.0), or DBH request in HAL v1.1.
locationRequest.setLocationSettingsIgnored(true); if (mNIHandler.getInEmergency()) {
durationMillis *= EMERGENCY_LOCATION_UPDATE_DURATION_MULTIPLIER; GnssConfiguration.HalInterfaceVersion halVersion =
mGnssConfiguration.getHalInterfaceVersion();
if (isUserEmergency || (halVersion.mMajor < 2 && !independentFromGnss)) {
locationRequest.setLocationSettingsIgnored(true);
durationMillis *= EMERGENCY_LOCATION_UPDATE_DURATION_MULTIPLIER;
}
} }
Log.i(TAG, Log.i(TAG,