summaryrefslogtreecommitdiffstats
path: root/services/jni
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-10-13 05:52:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-13 05:52:51 -0700
commit1442818a10988cc011f55104e997474b5d3d2468 (patch)
tree7b89b9927a74b4906e5971db7a07ec1be2258aba /services/jni
parent27023cc5fefc4e56f672ee264289fa319d97585b (diff)
parentc792c2e9edb3c785208560b6961ac6ed5b07eb4e (diff)
downloadframeworks_base-1442818a10988cc011f55104e997474b5d3d2468.zip
frameworks_base-1442818a10988cc011f55104e997474b5d3d2468.tar.gz
frameworks_base-1442818a10988cc011f55104e997474b5d3d2468.tar.bz2
am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp * commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e': GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
Diffstat (limited to 'services/jni')
-rwxr-xr-xservices/jni/com_android_server_location_GpsLocationProvider.cpp4
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);