am 11eada78: am ba2ec2b4: Merge "Enable framework GPS and location manager... (dd074306) · Commits · e / os / android_frameworks_base

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ import java.util.Set;
		*/
		public class LocationManagerService extends ILocationManager.Stub implements Runnable {
		private static final String TAG = "LocationManagerService";
		private static final boolean LOCAL_LOGV = false;
		private static final boolean LOCAL_LOGV = true;

		// The last time a location was written, by provider name.
		private HashMap<String,Long> mLastWriteTime = new HashMap<String,Long>();
		@@ -224,15 +224,18 @@ public class LocationManagerService extends ILocationManager.Stub implements Run

		@Override
		public String toString() {
		String result;
		if (mListener != null) {
		return "Receiver{"
		result = "Receiver{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " Listener " + mKey + "}";
		} else {
		return "Receiver{"
		result = "Receiver{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " Intent " + mKey + "}";
		}
		result += "mUpdateRecords: " + mUpdateRecords;
		return result;
		}

		public boolean isListener() {
		@@ -1007,7 +1010,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		public String toString() {
		return "UpdateRecord{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " " + mProvider + " " + mReceiver + "}";
		+ " mProvider: " + mProvider + " mUid: " + mUid + "}";
		}

		void dump(PrintWriter pw, String prefix) {
		@@ -1122,9 +1125,6 @@ public class LocationManagerService extends ILocationManager.Stub implements Run

		private void requestLocationUpdatesLocked(String provider, long minTime, float minDistance,
		boolean singleShot, Receiver receiver) {
		if (LOCAL_LOGV) {
		Slog.v(TAG, "_requestLocationUpdates: listener = " + receiver);
		}

		LocationProviderInterface p = mProvidersByName.get(provider);
		if (p == null) {
		@@ -1162,6 +1162,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		// Notify the listener that updates are currently disabled
		receiver.callProviderEnabledLocked(provider, false);
		}
		if (LOCAL_LOGV) {
		Slog.v(TAG, "_requestLocationUpdates: provider = " + provider + " listener = " + receiver);
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ public class GpsLocationProvider implements LocationProviderInterface {

		private static final String TAG = "GpsLocationProvider";

		private static final boolean DEBUG = false;
		private static final boolean DEBUG = true;
		private static final boolean VERBOSE = false;

		// these need to match GpsPositionMode enum in gps.h
		@@ -1240,6 +1240,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
		int result = mConnMgr.startUsingNetworkFeature(
		ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_SUPL);
		if (result == Phone.APN_ALREADY_ACTIVE) {
		if (DEBUG) Log.d(TAG, "Phone.APN_ALREADY_ACTIVE");
		if (mAGpsApn != null) {
		native_agps_data_conn_open(mAGpsApn);
		mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPEN;