Rename Gps to Gnss for measurement-related APIs
Bug: 26895757
Change-Id: I12d89dc251e356cf976a4bcd3589a8925a8ad745
diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index c55c5b6..14ddc36 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -24,12 +24,12 @@
import com.android.server.location.ActivityRecognitionProxy;
import com.android.server.location.FlpHardwareProvider;
import com.android.server.location.FusedProxy;
-import com.android.server.location.GnssLocationProvider;
import com.android.server.location.GeocoderProxy;
import com.android.server.location.GeofenceManager;
import com.android.server.location.GeofenceProxy;
-import com.android.server.location.GpsMeasurementsProvider;
-import com.android.server.location.GpsNavigationMessageProvider;
+import com.android.server.location.GnssLocationProvider;
+import com.android.server.location.GnssMeasurementsProvider;
+import com.android.server.location.GnssNavigationMessageProvider;
import com.android.server.location.LocationBlacklist;
import com.android.server.location.LocationFudger;
import com.android.server.location.LocationProviderInterface;
@@ -61,11 +61,11 @@
import android.location.Criteria;
import android.location.GeocoderParams;
import android.location.Geofence;
+import android.location.IGnssMeasurementsListener;
import android.location.IGnssStatusListener;
import android.location.IGnssStatusProvider;
import android.location.IGpsGeofenceHardware;
-import android.location.IGpsMeasurementsListener;
-import android.location.IGpsNavigationMessageListener;
+import android.location.IGnssNavigationMessageListener;
import android.location.ILocationListener;
import android.location.ILocationManager;
import android.location.INetInitiatedListener;
@@ -162,8 +162,8 @@
private LocationWorkerHandler mLocationHandler;
private PassiveProvider mPassiveProvider; // track passive provider for special cases
private LocationBlacklist mBlacklist;
- private GpsMeasurementsProvider mGpsMeasurementsProvider;
- private GpsNavigationMessageProvider mGpsNavigationMessageProvider;
+ private GnssMeasurementsProvider mGnssMeasurementsProvider;
+ private GnssNavigationMessageProvider mGnssNavigationMessageProvider;
private IGpsGeofenceHardware mGpsGeofenceProxy;
// --- fields below are protected by mLock ---
@@ -467,8 +467,8 @@
mNetInitiatedListener = gnssProvider.getNetInitiatedListener();
addProviderLocked(gnssProvider);
mRealProviders.put(LocationManager.GPS_PROVIDER, gnssProvider);
- mGpsMeasurementsProvider = gnssProvider.getGpsMeasurementsProvider();
- mGpsNavigationMessageProvider = gnssProvider.getGpsNavigationMessageProvider();
+ mGnssMeasurementsProvider = gnssProvider.getGnssMeasurementsProvider();
+ mGnssNavigationMessageProvider = gnssProvider.getGnssNavigationMessageProvider();
mGpsGeofenceProxy = gnssProvider.getGpsGeofenceProxy();
}
@@ -994,7 +994,7 @@
*/
@Override
public int getGpsYearOfHardware() {
- if (mGpsNavigationMessageProvider != null) {
+ if (mGnssNavigationMessageProvider != null) {
return mGpsSystemInfoProvider.getGpsYearOfHardware();
} else {
return 0;
@@ -1923,8 +1923,8 @@
}
@Override
- public boolean addGpsMeasurementsListener(
- IGpsMeasurementsListener listener,
+ public boolean addGnssMeasurementsListener(
+ IGnssMeasurementsListener listener,
String packageName) {
int allowedResolutionLevel = getCallerAllowedResolutionLevel();
checkResolutionLevelIsSufficientForProviderUse(
@@ -1941,22 +1941,22 @@
Binder.restoreCallingIdentity(identity);
}
- if (!hasLocationAccess || mGpsMeasurementsProvider == null) {
+ if (!hasLocationAccess || mGnssMeasurementsProvider == null) {
return false;
}
- return mGpsMeasurementsProvider.addListener(listener);
+ return mGnssMeasurementsProvider.addListener(listener);
}
@Override
- public void removeGpsMeasurementsListener(IGpsMeasurementsListener listener) {
- if (mGpsMeasurementsProvider != null) {
- mGpsMeasurementsProvider.removeListener(listener);
+ public void removeGnssMeasurementsListener(IGnssMeasurementsListener listener) {
+ if (mGnssMeasurementsProvider != null) {
+ mGnssMeasurementsProvider.removeListener(listener);
}
}
@Override
- public boolean addGpsNavigationMessageListener(
- IGpsNavigationMessageListener listener,
+ public boolean addGnssNavigationMessageListener(
+ IGnssNavigationMessageListener listener,
String packageName) {
int allowedResolutionLevel = getCallerAllowedResolutionLevel();
checkResolutionLevelIsSufficientForProviderUse(
@@ -1973,16 +1973,16 @@
Binder.restoreCallingIdentity(identity);
}
- if (!hasLocationAccess || mGpsNavigationMessageProvider == null) {
+ if (!hasLocationAccess || mGnssNavigationMessageProvider == null) {
return false;
}
- return mGpsNavigationMessageProvider.addListener(listener);
+ return mGnssNavigationMessageProvider.addListener(listener);
}
@Override
- public void removeGpsNavigationMessageListener(IGpsNavigationMessageListener listener) {
- if (mGpsNavigationMessageProvider != null) {
- mGpsNavigationMessageProvider.removeListener(listener);
+ public void removeGnssNavigationMessageListener(IGnssNavigationMessageListener listener) {
+ if (mGnssNavigationMessageProvider != null) {
+ mGnssNavigationMessageProvider.removeListener(listener);
}
}
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 9798e56..ffc52b3 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -38,8 +38,8 @@
import android.location.GnssStatus;
import android.location.IGnssStatusListener;
import android.location.IGnssStatusProvider;
-import android.location.GpsMeasurementsEvent;
-import android.location.GpsNavigationMessageEvent;
+import android.location.GnssMeasurementsEvent;
+import android.location.GnssNavigationMessageEvent;
import android.location.IGpsGeofenceHardware;
import android.location.ILocationManager;
import android.location.INetInitiatedListener;
@@ -368,8 +368,8 @@
private Location mLocation = new Location(LocationManager.GPS_PROVIDER);
private Bundle mLocationExtras = new Bundle();
private final GnssStatusListenerHelper mListenerHelper;
- private final GpsMeasurementsProvider mGpsMeasurementsProvider;
- private final GpsNavigationMessageProvider mGpsNavigationMessageProvider;
+ private final GnssMeasurementsProvider mGnssMeasurementsProvider;
+ private final GnssNavigationMessageProvider mGnssNavigationMessageProvider;
// Handler for processing events
private Handler mHandler;
@@ -428,12 +428,12 @@
return mGpsGeofenceBinder;
}
- public GpsMeasurementsProvider getGpsMeasurementsProvider() {
- return mGpsMeasurementsProvider;
+ public GnssMeasurementsProvider getGnssMeasurementsProvider() {
+ return mGnssMeasurementsProvider;
}
- public GpsNavigationMessageProvider getGpsNavigationMessageProvider() {
- return mGpsNavigationMessageProvider;
+ public GnssNavigationMessageProvider getGnssNavigationMessageProvider() {
+ return mGnssNavigationMessageProvider;
}
/**
@@ -713,7 +713,7 @@
}
};
- mGpsMeasurementsProvider = new GpsMeasurementsProvider(mHandler) {
+ mGnssMeasurementsProvider = new GnssMeasurementsProvider(mHandler) {
@Override
public boolean isAvailableInPlatform() {
return native_is_measurement_supported();
@@ -735,7 +735,7 @@
}
};
- mGpsNavigationMessageProvider = new GpsNavigationMessageProvider(mHandler) {
+ mGnssNavigationMessageProvider = new GnssNavigationMessageProvider(mHandler) {
@Override
protected boolean isAvailableInPlatform() {
return native_is_navigation_message_supported();
@@ -1087,8 +1087,8 @@
native_set_agps_server(AGPS_TYPE_C2K, mC2KServerHost, mC2KServerPort);
}
- mGpsMeasurementsProvider.onGpsEnabledChanged();
- mGpsNavigationMessageProvider.onGpsEnabledChanged();
+ mGnssMeasurementsProvider.onGpsEnabledChanged();
+ mGnssNavigationMessageProvider.onGpsEnabledChanged();
} else {
synchronized (mLock) {
mEnabled = false;
@@ -1123,8 +1123,8 @@
// do this before releasing wakelock
native_cleanup();
- mGpsMeasurementsProvider.onGpsEnabledChanged();
- mGpsNavigationMessageProvider.onGpsEnabledChanged();
+ mGnssMeasurementsProvider.onGpsEnabledChanged();
+ mGnssNavigationMessageProvider.onGpsEnabledChanged();
}
@Override
@@ -1655,15 +1655,15 @@
/**
* called from native code - Gps measurements callback
*/
- private void reportMeasurementData(GpsMeasurementsEvent event) {
- mGpsMeasurementsProvider.onMeasurementsAvailable(event);
+ private void reportMeasurementData(GnssMeasurementsEvent event) {
+ mGnssMeasurementsProvider.onMeasurementsAvailable(event);
}
/**
* called from native code - GPS navigation message callback
*/
- private void reportNavigationMessage(GpsNavigationMessageEvent event) {
- mGpsNavigationMessageProvider.onNavigationMessageAvailable(event);
+ private void reportNavigationMessage(GnssNavigationMessageEvent event) {
+ mGnssNavigationMessageProvider.onNavigationMessageAvailable(event);
}
/**
@@ -1677,9 +1677,9 @@
requestUtcTime();
}
- mGpsMeasurementsProvider.onCapabilitiesUpdated(
+ mGnssMeasurementsProvider.onCapabilitiesUpdated(
(capabilities & GPS_CAPABILITY_MEASUREMENTS) == GPS_CAPABILITY_MEASUREMENTS);
- mGpsNavigationMessageProvider.onCapabilitiesUpdated(
+ mGnssNavigationMessageProvider.onCapabilitiesUpdated(
(capabilities & GPS_CAPABILITY_NAV_MESSAGES) == GPS_CAPABILITY_NAV_MESSAGES);
}
diff --git a/services/core/java/com/android/server/location/GpsMeasurementsProvider.java b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java
similarity index 62%
rename from services/core/java/com/android/server/location/GpsMeasurementsProvider.java
rename to services/core/java/com/android/server/location/GnssMeasurementsProvider.java
index b327ca2..d9e8e91 100644
--- a/services/core/java/com/android/server/location/GpsMeasurementsProvider.java
+++ b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java
@@ -16,8 +16,8 @@
package com.android.server.location;
-import android.location.GpsMeasurementsEvent;
-import android.location.IGpsMeasurementsListener;
+import android.location.GnssMeasurementsEvent;
+import android.location.IGnssMeasurementsListener;
import android.os.Handler;
import android.os.RemoteException;
import android.util.Log;
@@ -29,27 +29,27 @@
*
* @hide
*/
-public abstract class GpsMeasurementsProvider
- extends RemoteListenerHelper<IGpsMeasurementsListener> {
- private static final String TAG = "GpsMeasurementsProvider";
+public abstract class GnssMeasurementsProvider
+ extends RemoteListenerHelper<IGnssMeasurementsListener> {
+ private static final String TAG = "GnssMeasurementsProvider";
- protected GpsMeasurementsProvider(Handler handler) {
+ protected GnssMeasurementsProvider(Handler handler) {
super(handler, TAG);
}
- public void onMeasurementsAvailable(final GpsMeasurementsEvent event) {
- ListenerOperation<IGpsMeasurementsListener> operation =
- new ListenerOperation<IGpsMeasurementsListener>() {
+ public void onMeasurementsAvailable(final GnssMeasurementsEvent event) {
+ ListenerOperation<IGnssMeasurementsListener> operation =
+ new ListenerOperation<IGnssMeasurementsListener>() {
@Override
- public void execute(IGpsMeasurementsListener listener) throws RemoteException {
- listener.onGpsMeasurementsReceived(event);
+ public void execute(IGnssMeasurementsListener listener) throws RemoteException {
+ listener.onGnssMeasurementsReceived(event);
}
};
foreach(operation);
}
- public void onCapabilitiesUpdated(boolean isGpsMeasurementsSupported) {
- setSupported(isGpsMeasurementsSupported);
+ public void onCapabilitiesUpdated(boolean isGnssMeasurementsSupported) {
+ setSupported(isGnssMeasurementsSupported);
updateResult();
}
@@ -60,19 +60,19 @@
}
@Override
- protected ListenerOperation<IGpsMeasurementsListener> getHandlerOperation(int result) {
+ protected ListenerOperation<IGnssMeasurementsListener> getHandlerOperation(int result) {
int status;
switch (result) {
case RESULT_SUCCESS:
- status = GpsMeasurementsEvent.STATUS_READY;
+ status = GnssMeasurementsEvent.STATUS_READY;
break;
case RESULT_NOT_AVAILABLE:
case RESULT_NOT_SUPPORTED:
case RESULT_INTERNAL_ERROR:
- status = GpsMeasurementsEvent.STATUS_NOT_SUPPORTED;
+ status = GnssMeasurementsEvent.STATUS_NOT_SUPPORTED;
break;
case RESULT_GPS_LOCATION_DISABLED:
- status = GpsMeasurementsEvent.STATUS_GPS_LOCATION_DISABLED;
+ status = GnssMeasurementsEvent.STATUS_GPS_LOCATION_DISABLED;
break;
case RESULT_UNKNOWN:
return null;
@@ -84,7 +84,7 @@
}
private static class StatusChangedOperation
- implements ListenerOperation<IGpsMeasurementsListener> {
+ implements ListenerOperation<IGnssMeasurementsListener> {
private final int mStatus;
public StatusChangedOperation(int status) {
@@ -92,7 +92,7 @@
}
@Override
- public void execute(IGpsMeasurementsListener listener) throws RemoteException {
+ public void execute(IGnssMeasurementsListener listener) throws RemoteException {
listener.onStatusChanged(mStatus);
}
}
diff --git a/services/core/java/com/android/server/location/GpsNavigationMessageProvider.java b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java
similarity index 61%
rename from services/core/java/com/android/server/location/GpsNavigationMessageProvider.java
rename to services/core/java/com/android/server/location/GnssNavigationMessageProvider.java
index e6bbe56..57bce4b 100644
--- a/services/core/java/com/android/server/location/GpsNavigationMessageProvider.java
+++ b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java
@@ -16,8 +16,8 @@
package com.android.server.location;
-import android.location.GpsNavigationMessageEvent;
-import android.location.IGpsNavigationMessageListener;
+import android.location.GnssNavigationMessageEvent;
+import android.location.IGnssNavigationMessageListener;
import android.os.Handler;
import android.os.RemoteException;
import android.util.Log;
@@ -29,28 +29,28 @@
*
* @hide
*/
-public abstract class GpsNavigationMessageProvider
- extends RemoteListenerHelper<IGpsNavigationMessageListener> {
- private static final String TAG = "GpsNavigationMessageProvider";
+public abstract class GnssNavigationMessageProvider
+ extends RemoteListenerHelper<IGnssNavigationMessageListener> {
+ private static final String TAG = "GnssNavigationMessageProvider";
- protected GpsNavigationMessageProvider(Handler handler) {
+ protected GnssNavigationMessageProvider(Handler handler) {
super(handler, TAG);
}
- public void onNavigationMessageAvailable(final GpsNavigationMessageEvent event) {
- ListenerOperation<IGpsNavigationMessageListener> operation =
- new ListenerOperation<IGpsNavigationMessageListener>() {
+ public void onNavigationMessageAvailable(final GnssNavigationMessageEvent event) {
+ ListenerOperation<IGnssNavigationMessageListener> operation =
+ new ListenerOperation<IGnssNavigationMessageListener>() {
@Override
- public void execute(IGpsNavigationMessageListener listener)
+ public void execute(IGnssNavigationMessageListener listener)
throws RemoteException {
- listener.onGpsNavigationMessageReceived(event);
+ listener.onGnssNavigationMessageReceived(event);
}
};
foreach(operation);
}
- public void onCapabilitiesUpdated(boolean isGpsNavigationMessageSupported) {
- setSupported(isGpsNavigationMessageSupported);
+ public void onCapabilitiesUpdated(boolean isGnssNavigationMessageSupported) {
+ setSupported(isGnssNavigationMessageSupported);
updateResult();
}
@@ -61,19 +61,19 @@
}
@Override
- protected ListenerOperation<IGpsNavigationMessageListener> getHandlerOperation(int result) {
+ protected ListenerOperation<IGnssNavigationMessageListener> getHandlerOperation(int result) {
int status;
switch (result) {
case RESULT_SUCCESS:
- status = GpsNavigationMessageEvent.STATUS_READY;
+ status = GnssNavigationMessageEvent.STATUS_READY;
break;
case RESULT_NOT_AVAILABLE:
case RESULT_NOT_SUPPORTED:
case RESULT_INTERNAL_ERROR:
- status = GpsNavigationMessageEvent.STATUS_NOT_SUPPORTED;
+ status = GnssNavigationMessageEvent.STATUS_NOT_SUPPORTED;
break;
case RESULT_GPS_LOCATION_DISABLED:
- status = GpsNavigationMessageEvent.STATUS_GPS_LOCATION_DISABLED;
+ status = GnssNavigationMessageEvent.STATUS_GPS_LOCATION_DISABLED;
break;
case RESULT_UNKNOWN:
return null;
@@ -85,7 +85,7 @@
}
private static class StatusChangedOperation
- implements ListenerOperation<IGpsNavigationMessageListener> {
+ implements ListenerOperation<IGnssNavigationMessageListener> {
private final int mStatus;
public StatusChangedOperation(int status) {
@@ -93,7 +93,7 @@
}
@Override
- public void execute(IGpsNavigationMessageListener listener) throws RemoteException {
+ public void execute(IGnssNavigationMessageListener listener) throws RemoteException {
listener.onStatusChanged(mStatus);
}
}
diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index 0c85a15..e75775f 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -537,11 +537,11 @@
method_reportMeasurementData = env->GetMethodID(
clazz,
"reportMeasurementData",
- "(Landroid/location/GpsMeasurementsEvent;)V");
+ "(Landroid/location/GnssMeasurementsEvent;)V");
method_reportNavigationMessages = env->GetMethodID(
clazz,
"reportNavigationMessage",
- "(Landroid/location/GpsNavigationMessageEvent;)V");
+ "(Landroid/location/GnssNavigationMessageEvent;)V");
err = hw_get_module(GPS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
if (err == 0) {
@@ -974,7 +974,7 @@
GpsClock* clock = reinterpret_cast<GpsClock*>(data);
- jclass gpsClockClass = env->FindClass("android/location/GpsClock");
+ jclass gpsClockClass = env->FindClass("android/location/GnssClock");
jmethodID gpsClockCtor = env->GetMethodID(gpsClockClass, "<init>", "()V");
jobject gpsClockObject = env->NewObject(gpsClockClass, gpsClockCtor);
@@ -1049,264 +1049,264 @@
const char* floatSignature = "(F)V";
const char* doubleSignature = "(D)V";
- jclass gpsMeasurementClass = env->FindClass("android/location/GpsMeasurement");
- jmethodID gpsMeasurementCtor = env->GetMethodID(gpsMeasurementClass, "<init>", "()V");
+ jclass gnssMeasurementClass = env->FindClass("android/location/GnssMeasurement");
+ jmethodID gnssMeasurementCtor = env->GetMethodID(gnssMeasurementClass, "<init>", "()V");
GpsMeasurement* measurement = reinterpret_cast<GpsMeasurement*>(data);
- jobject gpsMeasurementObject = env->NewObject(gpsMeasurementClass, gpsMeasurementCtor);
+ jobject gnssMeasurementObject = env->NewObject(gnssMeasurementClass, gnssMeasurementCtor);
GpsMeasurementFlags flags = measurement->flags;
- jmethodID prnSetterMethod = env->GetMethodID(gpsMeasurementClass, "setPrn", byteSignature);
- env->CallVoidMethod(gpsMeasurementObject, prnSetterMethod, measurement->prn);
+ jmethodID prnSetterMethod = env->GetMethodID(gnssMeasurementClass, "setPrn", byteSignature);
+ env->CallVoidMethod(gnssMeasurementObject, prnSetterMethod, measurement->prn);
jmethodID timeOffsetSetterMethod =
- env->GetMethodID(gpsMeasurementClass, "setTimeOffsetInNs", doubleSignature);
+ env->GetMethodID(gnssMeasurementClass, "setTimeOffsetInNs", doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
timeOffsetSetterMethod,
measurement->time_offset_ns);
- jmethodID stateSetterMethod = env->GetMethodID(gpsMeasurementClass, "setState", shortSignature);
- env->CallVoidMethod(gpsMeasurementObject, stateSetterMethod, measurement->state);
+ jmethodID stateSetterMethod = env->GetMethodID(gnssMeasurementClass, "setState", shortSignature);
+ env->CallVoidMethod(gnssMeasurementObject, stateSetterMethod, measurement->state);
jmethodID receivedGpsTowSetterMethod =
- env->GetMethodID(gpsMeasurementClass, "setReceivedGpsTowInNs", longSignature);
+ env->GetMethodID(gnssMeasurementClass, "setReceivedGpsTowInNs", longSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
receivedGpsTowSetterMethod,
measurement->received_gps_tow_ns);
jmethodID receivedGpsTowUncertaintySetterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setReceivedGpsTowUncertaintyInNs",
longSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
receivedGpsTowUncertaintySetterMethod,
measurement->received_gps_tow_uncertainty_ns);
jmethodID cn0SetterMethod =
- env->GetMethodID(gpsMeasurementClass, "setCn0InDbHz", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, cn0SetterMethod, measurement->c_n0_dbhz);
+ env->GetMethodID(gnssMeasurementClass, "setCn0InDbHz", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, cn0SetterMethod, measurement->c_n0_dbhz);
jmethodID pseudorangeRateSetterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setPseudorangeRateInMetersPerSec",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
pseudorangeRateSetterMethod,
measurement->pseudorange_rate_mps);
jmethodID pseudorangeRateUncertaintySetterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setPseudorangeRateUncertaintyInMetersPerSec",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
pseudorangeRateUncertaintySetterMethod,
measurement->pseudorange_rate_uncertainty_mps);
jmethodID accumulatedDeltaRangeStateSetterMethod =
- env->GetMethodID(gpsMeasurementClass, "setAccumulatedDeltaRangeState", shortSignature);
+ env->GetMethodID(gnssMeasurementClass, "setAccumulatedDeltaRangeState", shortSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
accumulatedDeltaRangeStateSetterMethod,
measurement->accumulated_delta_range_state);
jmethodID accumulatedDeltaRangeSetterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setAccumulatedDeltaRangeInMeters",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
accumulatedDeltaRangeSetterMethod,
measurement->accumulated_delta_range_m);
jmethodID accumulatedDeltaRangeUncertaintySetterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setAccumulatedDeltaRangeUncertaintyInMeters",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
accumulatedDeltaRangeUncertaintySetterMethod,
measurement->accumulated_delta_range_uncertainty_m);
if (flags & GPS_MEASUREMENT_HAS_PSEUDORANGE) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setPseudorangeInMeters", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->pseudorange_m);
+ env->GetMethodID(gnssMeasurementClass, "setPseudorangeInMeters", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->pseudorange_m);
}
if (flags & GPS_MEASUREMENT_HAS_PSEUDORANGE_UNCERTAINTY) {
jmethodID setterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setPseudorangeUncertaintyInMeters",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->pseudorange_uncertainty_m);
}
if (flags & GPS_MEASUREMENT_HAS_CODE_PHASE) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setCodePhaseInChips", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->code_phase_chips);
+ env->GetMethodID(gnssMeasurementClass, "setCodePhaseInChips", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->code_phase_chips);
}
if (flags & GPS_MEASUREMENT_HAS_CODE_PHASE_UNCERTAINTY) {
jmethodID setterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setCodePhaseUncertaintyInChips",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->code_phase_uncertainty_chips);
}
if (flags & GPS_MEASUREMENT_HAS_CARRIER_FREQUENCY) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setCarrierFrequencyInHz", floatSignature);
+ env->GetMethodID(gnssMeasurementClass, "setCarrierFrequencyInHz", floatSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->carrier_frequency_hz);
}
if (flags & GPS_MEASUREMENT_HAS_CARRIER_CYCLES) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setCarrierCycles", longSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->carrier_cycles);
+ env->GetMethodID(gnssMeasurementClass, "setCarrierCycles", longSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->carrier_cycles);
}
if (flags & GPS_MEASUREMENT_HAS_CARRIER_PHASE) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setCarrierPhase", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->carrier_phase);
+ env->GetMethodID(gnssMeasurementClass, "setCarrierPhase", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->carrier_phase);
}
if (flags & GPS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY) {
jmethodID setterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setCarrierPhaseUncertainty",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->carrier_phase_uncertainty);
}
jmethodID lossOfLockSetterMethod =
- env->GetMethodID(gpsMeasurementClass, "setLossOfLock", byteSignature);
- env->CallVoidMethod(gpsMeasurementObject, lossOfLockSetterMethod, measurement->loss_of_lock);
+ env->GetMethodID(gnssMeasurementClass, "setLossOfLock", byteSignature);
+ env->CallVoidMethod(gnssMeasurementObject, lossOfLockSetterMethod, measurement->loss_of_lock);
if (flags & GPS_MEASUREMENT_HAS_BIT_NUMBER) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setBitNumber", intSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->bit_number);
+ env->GetMethodID(gnssMeasurementClass, "setBitNumber", intSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->bit_number);
}
if (flags & GPS_MEASUREMENT_HAS_TIME_FROM_LAST_BIT) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setTimeFromLastBitInMs", shortSignature);
+ env->GetMethodID(gnssMeasurementClass, "setTimeFromLastBitInMs", shortSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->time_from_last_bit_ms);
}
if (flags & GPS_MEASUREMENT_HAS_DOPPLER_SHIFT) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setDopplerShiftInHz", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->doppler_shift_hz);
+ env->GetMethodID(gnssMeasurementClass, "setDopplerShiftInHz", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->doppler_shift_hz);
}
if (flags & GPS_MEASUREMENT_HAS_DOPPLER_SHIFT_UNCERTAINTY) {
jmethodID setterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setDopplerShiftUncertaintyInHz",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->doppler_shift_uncertainty_hz);
}
jmethodID multipathIndicatorSetterMethod =
- env->GetMethodID(gpsMeasurementClass, "setMultipathIndicator", byteSignature);
+ env->GetMethodID(gnssMeasurementClass, "setMultipathIndicator", byteSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
multipathIndicatorSetterMethod,
measurement->multipath_indicator);
if (flags & GPS_MEASUREMENT_HAS_SNR) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setSnrInDb", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->snr_db);
+ env->GetMethodID(gnssMeasurementClass, "setSnrInDb", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->snr_db);
}
if (flags & GPS_MEASUREMENT_HAS_ELEVATION) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setElevationInDeg", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->elevation_deg);
+ env->GetMethodID(gnssMeasurementClass, "setElevationInDeg", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->elevation_deg);
}
if (flags & GPS_MEASUREMENT_HAS_ELEVATION_UNCERTAINTY) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setElevationUncertaintyInDeg", doubleSignature);
+ env->GetMethodID(gnssMeasurementClass, "setElevationUncertaintyInDeg", doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->elevation_uncertainty_deg);
}
if (flags & GPS_MEASUREMENT_HAS_AZIMUTH) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass, "setAzimuthInDeg", doubleSignature);
- env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->azimuth_deg);
+ env->GetMethodID(gnssMeasurementClass, "setAzimuthInDeg", doubleSignature);
+ env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->azimuth_deg);
}
if (flags & GPS_MEASUREMENT_HAS_AZIMUTH_UNCERTAINTY) {
jmethodID setterMethod = env->GetMethodID(
- gpsMeasurementClass,
+ gnssMeasurementClass,
"setAzimuthUncertaintyInDeg",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->azimuth_uncertainty_deg);
}
- jmethodID usedInFixSetterMethod = env->GetMethodID(gpsMeasurementClass, "setUsedInFix", "(Z)V");
+ jmethodID usedInFixSetterMethod = env->GetMethodID(gnssMeasurementClass, "setUsedInFix", "(Z)V");
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
usedInFixSetterMethod,
(flags & GPS_MEASUREMENT_HAS_USED_IN_FIX) && measurement->used_in_fix);
if (size == sizeof(GpsMeasurement)) {
jmethodID setterMethod =
- env->GetMethodID(gpsMeasurementClass,
+ env->GetMethodID(gnssMeasurementClass,
"setPseudorangeRateCarrierInMetersPerSec",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->pseudorange_rate_carrier_mps);
setterMethod =
- env->GetMethodID(gpsMeasurementClass,
+ env->GetMethodID(gnssMeasurementClass,
"setPseudorangeRateCarrierUncertaintyInMetersPerSec",
doubleSignature);
env->CallVoidMethod(
- gpsMeasurementObject,
+ gnssMeasurementObject,
setterMethod,
measurement->pseudorange_rate_carrier_uncertainty_mps);
}
- env->DeleteLocalRef(gpsMeasurementClass);
- return gpsMeasurementObject;
+ env->DeleteLocalRef(gnssMeasurementClass);
+ return gnssMeasurementObject;
}
/**
@@ -1321,23 +1321,23 @@
return NULL;
}
- jclass gpsMeasurementClass = env->FindClass("android/location/GpsMeasurement");
- jobjectArray gpsMeasurementArray = env->NewObjectArray(
+ jclass gnssMeasurementClass = env->FindClass("android/location/GnssMeasurement");
+ jobjectArray gnssMeasurementArray = env->NewObjectArray(
measurementCount,
- gpsMeasurementClass,
+ gnssMeasurementClass,
NULL /* initialElement */);
for (uint16_t i = 0; i < measurementCount; ++i) {
- jobject gpsMeasurement = translate_gps_measurement(
+ jobject gnssMeasurement = translate_gps_measurement(
env,
&(gps_data->measurements[i]),
sizeof(gps_data->measurements[0]));
- env->SetObjectArrayElement(gpsMeasurementArray, i, gpsMeasurement);
- env->DeleteLocalRef(gpsMeasurement);
+ env->SetObjectArrayElement(gnssMeasurementArray, i, gnssMeasurement);
+ env->DeleteLocalRef(gnssMeasurement);
}
- env->DeleteLocalRef(gpsMeasurementClass);
- return gpsMeasurementArray;
+ env->DeleteLocalRef(gnssMeasurementClass);
+ return gnssMeasurementArray;
}
static void measurement_callback(GpsData* data) {
@@ -1360,25 +1360,25 @@
gpsClock = translate_gps_clock(env, &data->clock, sizeof(GpsClock_v1));
measurementArray = translate_gps_measurements<GpsData_v1>(env, data);
}
- jclass gpsMeasurementsEventClass = env->FindClass("android/location/GpsMeasurementsEvent");
- jmethodID gpsMeasurementsEventCtor = env->GetMethodID(
- gpsMeasurementsEventClass,
+ jclass gnssMeasurementsEventClass = env->FindClass("android/location/GnssMeasurementsEvent");
+ jmethodID gnssMeasurementsEventCtor = env->GetMethodID(
+ gnssMeasurementsEventClass,
"<init>",
- "(Landroid/location/GpsClock;[Landroid/location/GpsMeasurement;)V");
+ "(Landroid/location/GnssClock;[Landroid/location/GnssMeasurement;)V");
- jobject gpsMeasurementsEvent = env->NewObject(
- gpsMeasurementsEventClass,
- gpsMeasurementsEventCtor,
+ jobject gnssMeasurementsEvent = env->NewObject(
+ gnssMeasurementsEventClass,
+ gnssMeasurementsEventCtor,
gpsClock,
measurementArray);
- env->CallVoidMethod(mCallbacksObj, method_reportMeasurementData, gpsMeasurementsEvent);
+ env->CallVoidMethod(mCallbacksObj, method_reportMeasurementData, gnssMeasurementsEvent);
checkAndClearExceptionFromCallback(env, __FUNCTION__);
env->DeleteLocalRef(gpsClock);
env->DeleteLocalRef(measurementArray);
- env->DeleteLocalRef(gpsMeasurementsEventClass);
- env->DeleteLocalRef(gpsMeasurementsEvent);
+ env->DeleteLocalRef(gnssMeasurementsEventClass);
+ env->DeleteLocalRef(gnssMeasurementsEvent);
}
GpsMeasurementCallbacks sGpsMeasurementCallbacks = {
@@ -1432,7 +1432,7 @@
return NULL;
}
- jclass navigationMessageClass = env->FindClass("android/location/GpsNavigationMessage");
+ jclass navigationMessageClass = env->FindClass("android/location/GnssNavigationMessage");
jmethodID navigationMessageCtor = env->GetMethodID(navigationMessageClass, "<init>", "()V");
jobject navigationMessageObject = env->NewObject(navigationMessageClass, navigationMessageCtor);
@@ -1470,11 +1470,11 @@
jobject navigationMessage = translate_gps_navigation_message(env, message);
jclass navigationMessageEventClass =
- env->FindClass("android/location/GpsNavigationMessageEvent");
+ env->FindClass("android/location/GnssNavigationMessageEvent");
jmethodID navigationMessageEventCtor = env->GetMethodID(
navigationMessageEventClass,
"<init>",
- "(Landroid/location/GpsNavigationMessage;)V");
+ "(Landroid/location/GnssNavigationMessage;)V");
jobject navigationMessageEvent = env->NewObject(
navigationMessageEventClass,
navigationMessageEventCtor,