Merge "Add gnssSetCapabilitiesCb_2_1" (326b8ecf) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -645,10 +645,12 @@ struct GnssCallback : public IGnssCallback_V2_1 {
		Return<void> gnssSvStatusCb_2_0(const hidl_vec<IGnssCallback_V2_0::GnssSvInfo>& svInfoList) override {
		return gnssSvStatusCbImpl(svInfoList);
		}

		// New in 2.1
		Return<void> gnssSvStatusCb_2_1(const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList) override {
		return gnssSvStatusCbImpl(svInfoList);
		}
		Return<void> gnssSetCapabilitesCbImpl(uint32_t capabilities, bool hasSubHalCapabilityFlags);
		Return<void> gnssSetCapabilitiesCb_2_1(uint32_t capabilities) override;

		// TODO: Reconsider allocation cost vs threadsafety on these statics
		static const char* sNmeaString;
		@@ -851,6 +853,10 @@ Return<void> GnssCallback::gnssSetCapabilitiesCb_2_0(uint32_t capabilities) {
		return GnssCallback::gnssSetCapabilitesCb(capabilities);
		}

		Return<void> GnssCallback::gnssSetCapabilitiesCb_2_1(uint32_t capabilities) {
		return GnssCallback::gnssSetCapabilitesCb(capabilities);
		}

		Return<void> GnssCallback::gnssAcquireWakelockCb() {
		acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME);
		return Void();