Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev (5ef08182) · Commits · e / os / android_frameworks_base

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

+11 −9

Original line number	Diff line number	Diff line
		@@ -473,14 +473,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
		checkSmsSuplInit(intent);
		} else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) {
		checkWapSuplInit(intent);
		} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
		int networkState;
		if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
		networkState = LocationProvider.TEMPORARILY_UNAVAILABLE;
		} else {
		networkState = LocationProvider.AVAILABLE;
		}

		} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE)) {
		// retrieve NetworkInfo result for this UID
		NetworkInfo info =
		intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
		@@ -488,6 +481,15 @@ public class GpsLocationProvider implements LocationProviderInterface {
		mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
		info = connManager.getNetworkInfo(info.getType());

		int networkState;
		if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false) \|\|
		!info.isConnected()) {
		networkState = LocationProvider.TEMPORARILY_UNAVAILABLE;
		} else {
		networkState = LocationProvider.AVAILABLE;
		}


		updateNetworkState(networkState, info);
		} else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)
		\|\| Intent.ACTION_SCREEN_OFF.equals(action)
		@@ -715,7 +717,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
		intentFilter = new IntentFilter();
		intentFilter.addAction(ALARM_WAKEUP);
		intentFilter.addAction(ALARM_TIMEOUT);
		intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
		intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE);
		intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
		intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
		intentFilter.addAction(Intent.ACTION_SCREEN_ON);