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

Merge "Make GnssStatus and GpsStatus testable"

Browse Source
This commit is contained in:
Soonil Nagarkar
2019-11-14 22:04:37 +00:00
committed by Android (Google) Code Review
parent 71d15364f9 0d1890b0e0
commit fc28b55926
6 changed files with 306 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1818,15 +1818,14 @@ public class LocationManager {
Log.w(TAG, ex);
}
if (status == null) {
status = new GpsStatus();
}
// When mGnssStatus is null, that means that this method is called outside
// onGpsStatusChanged(). Return an empty status to maintain backwards compatibility.
GnssStatus gnssStatus = mGnssStatusListenerManager.getGnssStatus();
int ttff = mGnssStatusListenerManager.getTtff();
if (gnssStatus != null) {
status.setStatus(gnssStatus, ttff);
if (status == null) {
status = GpsStatus.create(gnssStatus, ttff);
} else {
status.setStatus(gnssStatus, ttff);
}
}
return status;
}
@@ -2820,8 +2819,8 @@ public class LocationManager {
@Override
public void onSvStatusChanged(int svCount, int[] svidWithFlags, float[] cn0s,
float[] elevations, float[] azimuths, float[] carrierFreqs) {
GnssStatus localStatus = new GnssStatus(svCount, svidWithFlags, cn0s, elevations,
azimuths, carrierFreqs);
GnssStatus localStatus = GnssStatus.wrap(svCount, svidWithFlags, cn0s,
elevations, azimuths, carrierFreqs);
mGnssStatus = localStatus;
execute((callback) -> callback.onSatelliteStatusChanged(localStatus));
}