diff options
Diffstat (limited to 'gps/android/GnssMeasurement.h')
-rw-r--r-- | gps/android/GnssMeasurement.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/gps/android/GnssMeasurement.h b/gps/android/GnssMeasurement.h index 373f0d0..4247dbf 100644 --- a/gps/android/GnssMeasurement.h +++ b/gps/android/GnssMeasurement.h @@ -18,21 +18,21 @@ * limitations under the License. */ -#ifndef ANDROID_HARDWARE_GNSS_V1_1_GNSSMEASUREMENT_H -#define ANDROID_HARDWARE_GNSS_V1_1_GNSSMEASUREMENT_H +#ifndef ANDROID_HARDWARE_GNSS_V1_0_GNSSMEASUREMENT_H +#define ANDROID_HARDWARE_GNSS_V1_0_GNSSMEASUREMENT_H -#include <android/hardware/gnss/1.1/IGnssMeasurement.h> +#include <android/hardware/gnss/1.0/IGnssMeasurement.h> #include <hidl/MQDescriptor.h> #include <hidl/Status.h> namespace android { namespace hardware { namespace gnss { -namespace V1_1 { +namespace V1_0 { namespace implementation { -using ::android::hardware::gnss::V1_1::IGnssMeasurement; -using ::android::hardware::gnss::V1_1::IGnssMeasurementCallback; +using ::android::hardware::gnss::V1_0::IGnssMeasurement; +using ::android::hardware::gnss::V1_0::IGnssMeasurementCallback; using ::android::hardware::Return; using ::android::hardware::Void; using ::android::hardware::hidl_vec; @@ -52,11 +52,6 @@ struct GnssMeasurement : public IGnssMeasurement { const sp<V1_0::IGnssMeasurementCallback>& callback) override; Return<void> close() override; - // Methods from ::android::hardware::gnss::V1_1::IGnssMeasurement follow. - Return<GnssMeasurement::GnssMeasurementStatus> setCallback_1_1( - const sp<IGnssMeasurementCallback>& callback, - bool enableFullTracking) override; - private: struct GnssMeasurementDeathRecipient : hidl_death_recipient { GnssMeasurementDeathRecipient(sp<GnssMeasurement> gnssMeasurement) : @@ -70,14 +65,13 @@ struct GnssMeasurement : public IGnssMeasurement { private: sp<GnssMeasurementDeathRecipient> mGnssMeasurementDeathRecipient = nullptr; sp<V1_0::IGnssMeasurementCallback> mGnssMeasurementCbIface = nullptr; - sp<IGnssMeasurementCallback> mGnssMeasurementCbIface_1_1 = nullptr; MeasurementAPIClient* mApi; }; } // namespace implementation -} // namespace V1_1 +} // namespace V1_0 } // namespace gnss } // namespace hardware } // namespace android -#endif // ANDROID_HARDWARE_GNSS_V1_1_GNSSMEASUREMENT_H +#endif // ANDROID_HARDWARE_GNSS_V1_0_GNSSMEASUREMENT_H |