MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temp compilation fix for LKG integration

Browse source 
CRs-Fixed: 2429432
Change-Id: I8141c5583cddbd0118b9e13ddf07534ee890372c
This commit is contained in:
Saurabh Srivastava 2019-04-04 13:36:47 +05:30
parent 3e614934d1
commit a6c61bde6a
5 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/2.0/Gnss.cpp
View file

@ -511,6 +511,16 @@ Return<bool> Gnss::injectBestLocation_2_0(
return false; return false;
} }
Return<sp<V2_0::IGnssBatching>> Gnss::getExtensionGnssBatching_2_0() {
ENTRY_LOG_CALLFLOW();
return nullptr;
}
Return<sp<V2_0::IGnssDebug>> Gnss::getExtensionGnssDebug_2_0() {
ENTRY_LOG_CALLFLOW();
return nullptr;
}
IGnss* HIDL_FETCH_IGnss(const char* hal) { IGnss* HIDL_FETCH_IGnss(const char* hal) {
ENTRY_LOG_CALLFLOW(); ENTRY_LOG_CALLFLOW();
IGnss* iface = nullptr; IGnss* iface = nullptr;

4
android/2.0/Gnss.h
View file

@ -121,6 +121,10 @@ struct Gnss : public IGnss {
Return<bool> injectBestLocation_2_0(const ::android::hardware::gnss::V2_0::GnssLocation& location) override; Return<bool> injectBestLocation_2_0(const ::android::hardware::gnss::V2_0::GnssLocation& location) override;
Return<sp<V2_0::IGnssBatching>> getExtensionGnssBatching_2_0() override;
Return<sp<V2_0::IGnssDebug>> getExtensionGnssDebug_2_0() override;
/** /**
* This method returns the IGnssVisibilityControl interface. * This method returns the IGnssVisibilityControl interface.
* *

8
android/2.0/location_api/MeasurementAPIClient.cpp
View file

@ -374,9 +374,11 @@ static void convertGnssData_2_0(GnssMeasurementsNotification& in,
if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_HALF_CYCLE_RESOLVED_BIT) if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_HALF_CYCLE_RESOLVED_BIT)
out.measurements[i].v1_1.accumulatedDeltaRangeState |= out.measurements[i].v1_1.accumulatedDeltaRangeState |=
IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_HALF_CYCLE_RESOLVED; IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_HALF_CYCLE_RESOLVED;
out.measurements[i].codeType =
static_cast<IGnssMeasurementCallback::GnssMeasurementCodeType>(in.measurements[i].codeType); // out.measurements[i].codeType =
out.measurements[i].otherCodeTypeName = in.measurements[i].otherCodeTypeName; // static_cast<IGnssMeasurementCallback::GnssMeasurementCodeType>(in.measurements[i].codeType);
// out.measurements[i].otherCodeTypeName = in.measurements[i].otherCodeTypeName;
if (in.measurements[i].stateMask & GNSS_MEASUREMENTS_STATE_CODE_LOCK_BIT) if (in.measurements[i].stateMask & GNSS_MEASUREMENTS_STATE_CODE_LOCK_BIT)
out.measurements[i].state |= IGnssMeasurementCallback::GnssMeasurementState::STATE_CODE_LOCK; out.measurements[i].state |= IGnssMeasurementCallback::GnssMeasurementState::STATE_CODE_LOCK;
if (in.measurements[i].stateMask & GNSS_MEASUREMENTS_STATE_BIT_SYNC_BIT) if (in.measurements[i].stateMask & GNSS_MEASUREMENTS_STATE_BIT_SYNC_BIT)

4
android/measurement_corrections/1.0/MeasurementCorrections.cpp
View file

@ -58,6 +58,10 @@ Return<bool> MeasurementCorrections::setCorrections(const ::android::hardware::g
return true; return true;
} }
Return<bool> MeasurementCorrections::setCallback(const sp<IMeasurementCorrectionsCallback>& callback) {
return true;
}
} // namespace implementation } // namespace implementation
} // namespace V1_0 } // namespace V1_0
} // namespace measurement_corrections } // namespace measurement_corrections

4
android/measurement_corrections/1.0/MeasurementCorrections.h
View file

@ -31,6 +31,7 @@
#define ANDROID_HARDWARE_GNSS_V1_0_MeasurementCorrections_H #define ANDROID_HARDWARE_GNSS_V1_0_MeasurementCorrections_H
#include <android/hardware/gnss/measurement_corrections/1.0/IMeasurementCorrections.h> #include <android/hardware/gnss/measurement_corrections/1.0/IMeasurementCorrections.h>
#include <android/hardware/gnss/measurement_corrections/1.0/IMeasurementCorrectionsCallback.h>
#include <hidl/MQDescriptor.h> #include <hidl/MQDescriptor.h>
#include <hidl/Status.h> #include <hidl/Status.h>
@ -51,6 +52,7 @@ using ::android::hardware::Return;
using ::android::hardware::Void; using ::android::hardware::Void;
using ::android::sp; using ::android::sp;
using ::android::hardware::gnss::V1_0::GnssLocation; using ::android::hardware::gnss::V1_0::GnssLocation;
using ::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrectionsCallback;
struct MeasurementCorrections : public IMeasurementCorrections { struct MeasurementCorrections : public IMeasurementCorrections {
MeasurementCorrections(); MeasurementCorrections();
@ -59,6 +61,8 @@ struct MeasurementCorrections : public IMeasurementCorrections {
// Methods from ::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrections follow. // Methods from ::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrections follow.
Return<bool> setCorrections(const ::android::hardware::gnss::measurement_corrections::V1_0::MeasurementCorrections& corrections) override; Return<bool> setCorrections(const ::android::hardware::gnss::measurement_corrections::V1_0::MeasurementCorrections& corrections) override;
Return<bool> setCallback(const sp<IMeasurementCorrectionsCallback>& callback) override;
}; };