Merge change 692 into donut (76b25e5e) · Commits · e / os / android_frameworks_base

location/java/com/android/internal/location/LocationProviderImpl.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.util.Log;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;

		/**
		* An abstract superclass for location provider implementations.
		@@ -62,8 +61,8 @@ public abstract class LocationProviderImpl extends LocationProvider {
		sProvidersByName.remove(provider.getName());
		}

		public static List<LocationProviderImpl> getProviders() {
		return new ArrayList<LocationProviderImpl>(sProviders);
		public static ArrayList<LocationProviderImpl> getProviders() {
		return sProviders;
		}

		public static LocationProviderImpl getProvider(String name) {

services/java/com/android/server/LocationManagerService.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -703,10 +703,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		if (LOCAL_LOGV) {
		Log.v(TAG, "getAllProviders");
		}
		List<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		ArrayList<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		ArrayList<String> out = new ArrayList<String>(providers.size());

		for (LocationProviderImpl p : providers) {
		for (int i = providers.size() - 1; i >= 0; i--) {
		LocationProviderImpl p = providers.get(i);
		out.add(p.getName());
		}
		return out;
		@@ -729,10 +729,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		if (LOCAL_LOGV) {
		Log.v(TAG, "getProviders");
		}
		List<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		ArrayList<String> out = new ArrayList<String>();

		for (LocationProviderImpl p : providers) {
		ArrayList<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		ArrayList<String> out = new ArrayList<String>(providers.size());
		for (int i = providers.size() - 1; i >= 0; i--) {
		LocationProviderImpl p = providers.get(i);
		String name = p.getName();
		if (isAllowedProviderSafe(name)) {
		if (enabledOnly && !isAllowedBySettingsLocked(name)) {
		@@ -745,7 +745,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		}

		private void updateProvidersLocked() {
		for (LocationProviderImpl p : LocationProviderImpl.getProviders()) {
		ArrayList<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		for (int i = providers.size() - 1; i >= 0; i--) {
		LocationProviderImpl p = providers.get(i);
		boolean isEnabled = p.isEnabled();
		String name = p.getName();
		boolean shouldBeEnabled = isAllowedBySettingsLocked(name);
		@@ -1718,8 +1720,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run

		// Notify location providers of current network state
		synchronized (mLock) {
		List<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		for (LocationProviderImpl provider : providers) {
		ArrayList<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
		for (int i = providers.size() - 1; i >= 0; i--) {
		LocationProviderImpl provider = providers.get(i);
		if (provider.requiresNetwork()) {
		provider.updateNetworkState(mNetworkState);
		}