Merge "GPS: Disable verbose logging" into gingerbread (8c32bddf) · Commits · e / os / android_frameworks_base

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

+4 −1

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 = true;
		private static final boolean LOCAL_LOGV = false;

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

		public Location getLastKnownLocation(String provider) {
		if (LOCAL_LOGV) {
		Slog.v(TAG, "getLastKnownLocation: " + provider);
		}
		try {
		synchronized (mLock) {
		return _getLastKnownLocationLocked(provider);

+3 −4

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 = true;
		private static final boolean DEBUG = false;
		private static final boolean VERBOSE = false;

		// these need to match GpsPositionMode enum in gps.h
		@@ -1250,7 +1250,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
		native_agps_data_conn_failed();
		}
		} else if (result == Phone.APN_REQUEST_STARTED) {
		if (DEBUG) Log.d(TAG, "Phone.APN_ALREADYAPN_REQUEST_STARTED_ACTIVE");
		if (DEBUG) Log.d(TAG, "Phone.APN_REQUEST_STARTED");
		// Nothing to do here
		} else {
		if (DEBUG) Log.d(TAG, "startUsingNetworkFeature failed");
		@@ -1492,8 +1492,7 @@ public class GpsLocationProvider implements LocationProviderInterface {

		private final class ProviderHandler extends Handler {
		@Override
		public void handleMessage(Message msg)
		{
		public void handleMessage(Message msg) {
		int message = msg.what;
		switch (message) {
		case ENABLE: