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

Commit 1442818a authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am c792c2e9: Merge "GPS: Remove unnecessary and broken test in... 

am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread

Merge commit 'c792c2e9' into gingerbread-plus-aosp

* commit 'c792c2e9':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
parents 27023cc5 c792c2e9

services/jni/com_android_server_location_GpsLocationProvider.cpp

+1 −3
Original line number Diff line number Diff line
@@ -590,9 +590,7 @@ static void android_location_GpsLocationProvider_update_network_state(JNIEnv* en 
        jboolean connected, int type, jboolean roaming, jstring extraInfo)

{

    const AGpsRilInterface* interface = GetAGpsRilInterface(env, obj);

    if (interface &&

            (interface->size > ((char *)&interface->update_network_state - (char *)&interface)) &&

            interface->update_network_state) {

    if (interface && interface->update_network_state) {

        if (extraInfo) {

            const char *extraInfoStr = env->GetStringUTFChars(extraInfo, NULL);

            interface->update_network_state(connected, type, roaming, extraInfoStr);