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

Rename Gps to Gnss for measurement-related APIs

Browse Source 
Bug: 26895757
Change-Id: I12d89dc251e356cf976a4bcd3589a8925a8ad745
This commit is contained in:
Lifu Tang
2016-02-01 01:52:00 -08:00
parent 59235e66a5
commit 818aa2c2c4
22 changed files with 568 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
location/java/android/location/LocationManager.java
View File

@@ -64,8 +64,8 @@ public class LocationManager {
private final Context mContext;
private final ILocationManager mService;
private final GpsMeasurementCallbackTransport mGpsMeasurementCallbackTransport;
private final GpsNavigationMessageCallbackTransport mGpsNavigationMessageCallbackTransport;
private final GnssMeasurementCallbackTransport mGnssMeasurementCallbackTransport;
private final GnssNavigationMessageCallbackTransport mGnssNavigationMessageCallbackTransport;
private final HashMap<GpsStatus.Listener, GnssStatusListenerTransport> mGpsStatusListeners =
new HashMap<>();
private final HashMap<GpsStatus.NmeaListener, GnssStatusListenerTransport> mGpsNmeaListeners =
@@ -321,9 +321,9 @@ public class LocationManager {
public LocationManager(Context context, ILocationManager service) {
mService = service;
mContext = context;
mGpsMeasurementCallbackTransport = new GpsMeasurementCallbackTransport(mContext, mService);
mGpsNavigationMessageCallbackTransport =
new GpsNavigationMessageCallbackTransport(mContext, mService);
mGnssMeasurementCallbackTransport = new GnssMeasurementCallbackTransport(mContext, mService);
mGnssNavigationMessageCallbackTransport =
new GnssNavigationMessageCallbackTransport(mContext, mService);
}
private LocationProvider createProvider(String name, ProviderProperties properties) {
@@ -1819,68 +1819,68 @@ public class LocationManager {
/**
* Registers a GPS Measurement callback.
*
* @param callback a {@link GpsMeasurementsEvent.Callback} object to register.
* @param callback a {@link GnssMeasurementsEvent.Callback} object to register.
* @return {@code true} if the callback was added successfully, {@code false} otherwise.
*/
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean registerGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback) {
return registerGpsMeasurementCallback(callback, null);
public boolean registerGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback) {
return registerGnssMeasurementCallback(callback, null);
}
/**
* Registers a GPS Measurement callback.
*
* @param callback a {@link GpsMeasurementsEvent.Callback} object to register.
* @param callback a {@link GnssMeasurementsEvent.Callback} object to register.
* @param handler the handler that the callback runs on.
* @return {@code true} if the callback was added successfully, {@code false} otherwise.
*/
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean registerGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback,
public boolean registerGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback,
Handler handler) {
return mGpsMeasurementCallbackTransport.add(callback, handler);
return mGnssMeasurementCallbackTransport.add(callback, handler);
}
/**
* Unregisters a GPS Measurement callback.
*
* @param callback a {@link GpsMeasurementsEvent.Callback} object to remove.
* @param callback a {@link GnssMeasurementsEvent.Callback} object to remove.
*/
public void unregisterGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback) {
mGpsMeasurementCallbackTransport.remove(callback);
public void unregisterGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback) {
mGnssMeasurementCallbackTransport.remove(callback);
}
/**
* Registers a GPS Navigation Message callback.
*
* @param callback a {@link GpsNavigationMessageEvent.Callback} object to register.
* @param callback a {@link GnssNavigationMessageEvent.Callback} object to register.
* @return {@code true} if the callback was added successfully, {@code false} otherwise.
*/
public boolean registerGpsNavigationMessageCallback(
GpsNavigationMessageEvent.Callback callback) {
return registerGpsNavigationMessageCallback(callback, null);
public boolean registerGnssNavigationMessageCallback(
GnssNavigationMessageEvent.Callback callback) {
return registerGnssNavigationMessageCallback(callback, null);
}
/**
* Registers a GPS Navigation Message callback.
*
* @param callback a {@link GpsNavigationMessageEvent.Callback} object to register.
* @param callback a {@link GnssNavigationMessageEvent.Callback} object to register.
* @param handler the handler that the callback runs on.
* @return {@code true} if the callback was added successfully, {@code false} otherwise.
*/
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean registerGpsNavigationMessageCallback(
GpsNavigationMessageEvent.Callback callback, Handler handler) {
return mGpsNavigationMessageCallbackTransport.add(callback, handler);
public boolean registerGnssNavigationMessageCallback(
GnssNavigationMessageEvent.Callback callback, Handler handler) {
return mGnssNavigationMessageCallbackTransport.add(callback, handler);
}
/**
* Unregisters a GPS Navigation Message callback.
*
* @param callback a {@link GpsNavigationMessageEvent.Callback} object to remove.
* @param callback a {@link GnssNavigationMessageEvent.Callback} object to remove.
*/
public void unregisterGpsNavigationMessageCallback(
GpsNavigationMessageEvent.Callback callback) {
mGpsNavigationMessageCallbackTransport.remove(callback);
public void unregisterGnssNavigationMessageCallback(
GnssNavigationMessageEvent.Callback callback) {
mGnssNavigationMessageCallbackTransport.remove(callback);
}
/**