summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-10-13 05:46:15 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-13 05:46:15 -0700
commitc792c2e9edb3c785208560b6961ac6ed5b07eb4e (patch)
treecfc4d3cf2a117a1b5c50219fefee2ce289248061
parente03471e12f1adcd818b5bfd9dcb894c75fe955c5 (diff)
parentf7b7330e710a5f751f9898739378be282471e9ef (diff)
Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
-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 43e8467fb6dd..1d93f828b273 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);