Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc1f396 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 8333d591: am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbread 

Merge commit '8333d591'

* commit '8333d591':
  GPS: Enable some more logging
parents b8b200d1 8333d591

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

+3 −1
Original line number Diff line number Diff line
@@ -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();

                }

services/jni/com_android_server_location_GpsLocationProvider.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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__);