Enable framework GPS and location manager logging
Change-Id: Id54fc01e7288e7d90d7b76824b708bcb2ee88333
Signed-off-by: Mike Lockwood <lockwood@google.com>
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 84024b8..fe1b231 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -89,7 +89,7 @@
*/
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 @@
@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() {
@@ -1004,7 +1007,7 @@
public String toString() {
return "UpdateRecord{"
+ Integer.toHexString(System.identityHashCode(this))
- + " " + mProvider + " " + mReceiver + "}";
+ + " mProvider: " + mProvider + " mUid: " + mUid + "}";
}
void dump(PrintWriter pw, String prefix) {
@@ -1119,9 +1122,6 @@
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) {
@@ -1159,6 +1159,9 @@
// 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);
}
diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java
index f9c1679..b05d214 100755
--- a/services/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/java/com/android/server/location/GpsLocationProvider.java
@@ -82,7 +82,7 @@
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 @@
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;
