Merge "Loading gps_debug configuration before use" into oc-dev am: 08ca0a5a9e (2bdca70f) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -583,6 +583,10 @@ public class GnssLocationProvider implements LocationProviderInterface {
	// override default value of this if lpp_prof is not empty		// override default value of this if lpp_prof is not empty
	properties.setProperty("LPP_PROFILE", lpp_prof);		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.		// TODO: we should get rid of C2K specific setting.
	setSuplHostPort(properties.getProperty("SUPL_HOST"),		setSuplHostPort(properties.getProperty("SUPL_HOST"),
	properties.getProperty("SUPL_PORT"));		properties.getProperty("SUPL_PORT"));
	@@ -595,10 +599,6 @@ public class GnssLocationProvider implements LocationProviderInterface {
	Log.e(TAG, "unable to parse C2K_PORT: " + portString);		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()) {		if (native_is_gnss_configuration_supported()) {
	Map<String, SetCarrierProperty> map = new HashMap<String, SetCarrierProperty>() {		Map<String, SetCarrierProperty> map = new HashMap<String, SetCarrierProperty>() {
	{		{
	@@ -672,7 +672,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
	}		}

	} catch (IOException e) {		} 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 false;
	}		}
	return true;		return true;