From 3e1cd0bdf84690bf1d1022340dfb4dd19c8cb1fa Mon Sep 17 00:00:00 2001 From: Wyatt Riley Date: Wed, 19 Apr 2017 17:57:14 -0700 Subject: Loading gps_debug configuration before use Was calling this after (one of) the SUPL value injections, now calling before. Also masking an overly verbose related log message. Test: Build, loaded on Marlin, GPS & Xtra delete works. Bug: 37500417 Change-Id: I768048c8b2d2a6af97a3b4b8a059b08650d616a5 --- .../java/com/android/server/location/GnssLocationProvider.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 3a1ddd789f13..5b2e93703dcb 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -575,6 +575,10 @@ public class GnssLocationProvider implements LocationProviderInterface { // override default value of this if lpp_prof is not empty properties.setProperty("LPP_PROFILE", lpp_prof); } + /* + * Overlay carrier properties from a debug configuration file. + */ + loadPropertiesFromFile(DEBUG_PROPERTIES_FILE, properties); // TODO: we should get rid of C2K specific setting. setSuplHostPort(properties.getProperty("SUPL_HOST"), properties.getProperty("SUPL_PORT")); @@ -587,10 +591,6 @@ public class GnssLocationProvider implements LocationProviderInterface { Log.e(TAG, "unable to parse C2K_PORT: " + portString); } } - /* - * Allow carrier properties to be loaded from a debug configuration file. - */ - loadPropertiesFromFile(DEBUG_PROPERTIES_FILE, properties); if (native_is_gnss_configuration_supported()) { Map map = new HashMap() { { @@ -664,7 +664,7 @@ public class GnssLocationProvider implements LocationProviderInterface { } } catch (IOException e) { - Log.v(TAG, "Could not open GPS configuration file " + filename); + if (DEBUG) Log.d(TAG, "Could not open GPS configuration file " + filename); return false; } return true; -- cgit v1.2.3-59-g8ed1b