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

Removed all the references to deprecated class

Browse Source 
Bug: 28144767
Change-Id: If14752a81f6662fb33aacc04d54bfee249221d74
This commit is contained in:
Lifu Tang
2016-04-12 14:00:14 -07:00
parent 1ee2dd2f5f
commit 5b49d8a006
2 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/location/GnssLocationProvider.java
View File

@@ -40,7 +40,6 @@ import android.location.IGnssStatusListener;
import android.location.IGnssStatusProvider;
import android.location.GnssMeasurementsEvent;
import android.location.GnssNavigationMessage;
import android.location.GnssNavigationMessageEvent;
import android.location.IGpsGeofenceHardware;
import android.location.ILocationManager;
import android.location.INetInitiatedListener;
@@ -1667,16 +1666,6 @@ public class GnssLocationProvider implements LocationProviderInterface {
mGnssNavigationMessageProvider.onNavigationMessageAvailable(event);
}
/**
* called from native code - GPS navigation message callback
*/
private void reportNavigationMessage(GnssNavigationMessageEvent event) {
if (event != null) {
mGnssNavigationMessageProvider
.onNavigationMessageAvailable(event.getNavigationMessage());
}
}
/**
* called from native code to inform us what the GPS engine capabilities are
*/

30
services/core/jni/com_android_server_location_GnssLocationProvider.cpp
View File

@@ -562,7 +562,7 @@ static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env,
method_reportNavigationMessages = env->GetMethodID(
clazz,
"reportNavigationMessage",
"(Landroid/location/GnssNavigationMessageEvent;)V");
"(Landroid/location/GnssNavigationMessage;)V");
err = hw_get_module(GPS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
if (err == 0) {
@@ -1486,26 +1486,6 @@ static jobject translate_gnss_navigation_message(
return object.get();
}
static void set_navigation_message(jobject navigationMessage) {
JNIEnv* env = AndroidRuntime::getJNIEnv();
jclass navigationMessageEventClass =
env->FindClass("android/location/GnssNavigationMessageEvent");
jmethodID navigationMessageEventCtor = env->GetMethodID(
navigationMessageEventClass,
"<init>",
"(Landroid/location/GnssNavigationMessage;)V");
jobject navigationMessageEvent = env->NewObject(
navigationMessageEventClass,
navigationMessageEventCtor,
navigationMessage);
env->CallVoidMethod(mCallbacksObj,
method_reportNavigationMessages,
navigationMessageEvent);
checkAndClearExceptionFromCallback(env, __FUNCTION__);
env->DeleteLocalRef(navigationMessageEventClass);
env->DeleteLocalRef(navigationMessageEvent);
}
static void navigation_message_callback(GpsNavigationMessage* message) {
if (message == NULL) {
ALOGE("Invalid Navigation Message provided to callback");
@@ -1517,7 +1497,9 @@ static void navigation_message_callback(GpsNavigationMessage* message) {
}
JNIEnv* env = AndroidRuntime::getJNIEnv();
jobject navigationMessage = translate_gps_navigation_message(env, message);
set_navigation_message(navigationMessage);
env->CallVoidMethod(mCallbacksObj,
method_reportNavigationMessages,
navigationMessage);
env->DeleteLocalRef(navigationMessage);
}
@@ -1532,7 +1514,9 @@ static void gnss_navigation_message_callback(GnssNavigationMessage* message) {
}
JNIEnv* env = AndroidRuntime::getJNIEnv();
jobject navigationMessage = translate_gnss_navigation_message(env, message);
set_navigation_message(navigationMessage);
env->CallVoidMethod(mCallbacksObj,
method_reportNavigationMessages,
navigationMessage);
env->DeleteLocalRef(navigationMessage);
}