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

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

Browse Source 
Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp

* commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
This commit is contained in:
Mike Lockwood
2010-10-13 05:52:51 -07:00
committed by Android Git Automerger
parent 27023cc5fe c792c2e9ed
commit 1442818a10
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/jni/com_android_server_location_GpsLocationProvider.cpp
View File

@@ -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);