Merge "Fixed the hasCarrierFrequency flag in GnssStatus(part 2)" into oc-dev

am: dc24ef0ff3

Change-Id: I28a312340c0990ec89e9015c76f7839f44af4f77
This commit is contained in:
Yipeng Cao 2017-04-29 22:42:30 +00:00 committed by android-build-merger
commit 0a210de9e2

View file

@ -129,16 +129,19 @@ void Gnss::gnssSvStatusCb(GnssSvStatus* status) {
auto svInfo = status->gnss_sv_list[i];
IGnssCallback::GnssSvInfo gnssSvInfo = {
.svid = svInfo.svid,
.constellation = static_cast<android::hardware::gnss::V1_0::GnssConstellationType>(
.constellation = static_cast<
android::hardware::gnss::V1_0::GnssConstellationType>(
svInfo.constellation),
.cN0Dbhz = svInfo.c_n0_dbhz,
.elevationDegrees = svInfo.elevation,
.azimuthDegrees = svInfo.azimuth,
.svFlag = svInfo.flags,
// Older chipsets do not provide carrier frequency, hence HAS_CARRIER_FREQUENCY flag
// is not set and the carrierFrequencyHz field is set to zero
.carrierFrequencyHz = 0
};
// Older chipsets do not provide carrier frequency, hence
// HAS_CARRIER_FREQUENCY flag and the carrierFrequencyHz fields
// are not set. So we are resetting both fields here.
.svFlag = static_cast<uint8_t>(
svInfo.flags &= ~(static_cast<uint8_t>(
IGnssCallback::GnssSvFlags::HAS_CARRIER_FREQUENCY))),
.carrierFrequencyHz = 0};
svStatus.gnssSvList[i] = gnssSvInfo;
}