Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c357cdf2 authored by Lifu Tang's avatar Lifu Tang Committed by android-build-merger
Browse files

Merge "Removed all the references to deprecated class" into nyc-dev 

am: d7e1d429

* commit 'd7e1d429':
  Removed all the references to deprecated class

Change-Id: I3b5b7793919a52c906ff804c7b2d14a64b0b139e
parents 1ba09d66 d7e1d429

services/core/java/com/android/server/location/GnssLocationProvider.java

+0 −11
Original line number Diff line number Diff line
@@ -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

     */

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+7 −23
Original line number Diff line number Diff line
@@ -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);

}