diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-10-14 22:37:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 22:37:14 -0700 |
| commit | d7117f04d816e06e20c1b34f277e11e237d39a71 (patch) | |
| tree | f6aade4bbd422472c23b1d63553339a564e49c66 /services/jni | |
| parent | 6948369ac843db2791114b91a66e2d4a15660410 (diff) | |
| parent | 1442818a10988cc011f55104e997474b5d3d2468 (diff) | |
| download | frameworks_base-d7117f04d816e06e20c1b34f277e11e237d39a71.zip frameworks_base-d7117f04d816e06e20c1b34f277e11e237d39a71.tar.gz frameworks_base-d7117f04d816e06e20c1b34f277e11e237d39a71.tar.bz2 | |
am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Merge commit '1442818a10988cc011f55104e997474b5d3d2468'
* commit '1442818a10988cc011f55104e997474b5d3d2468':
GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
Diffstat (limited to 'services/jni')
| -rwxr-xr-x | services/jni/com_android_server_location_GpsLocationProvider.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/jni/com_android_server_location_GpsLocationProvider.cpp b/services/jni/com_android_server_location_GpsLocationProvider.cpp index 43e8467..1d93f82 100755 --- a/services/jni/com_android_server_location_GpsLocationProvider.cpp +++ b/services/jni/com_android_server_location_GpsLocationProvider.cpp @@ -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); |