drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread

Browse Source 
Merge commit '86564dc673db6dd752c326e53404677a3db43bec' into gingerbread-plus-aosp

* commit '86564dc673db6dd752c326e53404677a3db43bec':
  GPS: Add update_network_state call to AGpsRillInterface
This commit is contained in:
Mike Lockwood
2010-10-11 12:05:20 -07:00
committed by Android Git Automerger
parent 3a4b7dfdda 86564dc673
commit 431dd3b1bc
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/location/GpsLocationProvider.java
View File

@ -493,6 +493,11 @@ public class GpsLocationProvider implements LocationProviderInterface {
+ " info: " + info); + " info: " + info);
} }
if (info != null) {
native_update_network_state(info.isConnected(), info.getType(),
info.isRoaming(), info.getExtraInfo());
}
if (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE_SUPL if (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE_SUPL
&& mAGpsDataConnectionState == AGPS_DATA_CONNECTION_OPENING) { && mAGpsDataConnectionState == AGPS_DATA_CONNECTION_OPENING) {
String apnName = info.getExtraInfo(); String apnName = info.getExtraInfo();
@ -1601,4 +1606,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
private native void native_agps_set_ref_location_cellid(int type, int mcc, int mnc, private native void native_agps_set_ref_location_cellid(int type, int mcc, int mnc,
int lac, int cid); int lac, int cid);
private native void native_agps_set_id(int type, String setid); private native void native_agps_set_id(int type, String setid);
private native void native_update_network_state(boolean connected, int type,
boolean roaming, String extraInfo);
} }

18
services/jni/com_android_server_location_GpsLocationProvider.cpp
View File

@ -586,6 +586,23 @@ static jstring android_location_GpsLocationProvider_get_internal_state(JNIEnv* e
return result; return result;
} }
static void android_location_GpsLocationProvider_update_network_state(JNIEnv* env, jobject obj,
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 (extraInfo) {
const char *extraInfoStr = env->GetStringUTFChars(extraInfo, NULL);
interface->update_network_state(connected, type, roaming, extraInfoStr);
env->ReleaseStringUTFChars(extraInfo, extraInfoStr);
} else {
interface->update_network_state(connected, type, roaming, NULL);
}
}
}
static JNINativeMethod sMethods[] = { static JNINativeMethod sMethods[] = {
/* name, signature, funcPtr */ /* name, signature, funcPtr */
{"class_init_native", "()V", (void *)android_location_GpsLocationProvider_class_init_native}, {"class_init_native", "()V", (void *)android_location_GpsLocationProvider_class_init_native},
@ -611,6 +628,7 @@ static JNINativeMethod sMethods[] = {
{"native_send_ni_response", "(II)V", (void*)android_location_GpsLocationProvider_send_ni_response}, {"native_send_ni_response", "(II)V", (void*)android_location_GpsLocationProvider_send_ni_response},
{"native_agps_ni_message", "([BI)V", (void *)android_location_GpsLocationProvider_agps_send_ni_message}, {"native_agps_ni_message", "([BI)V", (void *)android_location_GpsLocationProvider_agps_send_ni_message},
{"native_get_internal_state", "()Ljava/lang/String;", (void*)android_location_GpsLocationProvider_get_internal_state}, {"native_get_internal_state", "()Ljava/lang/String;", (void*)android_location_GpsLocationProvider_get_internal_state},
{"native_update_network_state", "(ZIZLjava/lang/String;)V", (void*)android_location_GpsLocationProvider_update_network_state },
}; };
int register_android_server_location_GpsLocationProvider(JNIEnv* env) int register_android_server_location_GpsLocationProvider(JNIEnv* env)