Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "GPS: Enable some more logging" into gingerbread

Browse Source
This commit is contained in:
Mike Lockwood
2010-10-18 15:14:46 -07:00
committed by Android (Google) Code Review
parent 7689dd4928 b8d9033d99
commit 5d5a9db514
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/location/GpsLocationProvider.java
View File

@@ -1113,7 +1113,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
* called from native code to update our status
*/
private void reportStatus(int status) {
if (VERBOSE) Log.v(TAG, "reportStatus status: " + status);
if (DEBUG) Log.v(TAG, "reportStatus status: " + status);
synchronized(mListeners) {
boolean wasNavigating = mNavigating;
@@ -1250,8 +1250,10 @@ 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");
// Nothing to do here
} else {
if (DEBUG) Log.d(TAG, "startUsingNetworkFeature failed");
mAGpsDataConnectionState = AGPS_DATA_CONNECTION_CLOSED;
native_agps_data_conn_failed();
}

3
services/jni/com_android_server_location_GpsLocationProvider.cpp
View File

@@ -16,7 +16,7 @@
#define LOG_TAG "GpsLocationProvider"
//#define LOG_NDEBUG 0
#define LOG_NDEBUG 0
#include "JNIHelp.h"
#include "jni.h"
@@ -106,6 +106,7 @@ static void nmea_callback(GpsUtcTime timestamp, const char* nmea, int length)
static void set_capabilities_callback(uint32_t capabilities)
{
LOGD("set_capabilities_callback: %ld\n", capabilities);
JNIEnv* env = AndroidRuntime::getJNIEnv();
env->CallVoidMethod(mCallbacksObj, method_setEngineCapabilities, capabilities);
checkAndClearExceptionFromCallback(env, __FUNCTION__);