Merge "radiocompat: Use functions from IRadio 1.4 to set/get network types" into main (2da647be) · Commits · e / os / android_hardware_interfaces

radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ ScopedAStatus RadioNetwork::getAllowedNetworkTypesBitmap(int32_t serial) {
		if (mHal1_6) {
		mHal1_6->getAllowedNetworkTypesBitmap(serial);
		} else {
		mHal1_5->getPreferredNetworkType(serial);
		mHal1_5->getPreferredNetworkTypeBitmap(serial);
		}
		return ok();
		}
		@@ -166,7 +166,7 @@ ScopedAStatus RadioNetwork::setAllowedNetworkTypesBitmap(int32_t serial, int32_t
		if (mHal1_6) {
		mHal1_6->setAllowedNetworkTypesBitmap(serial, raf);
		} else {
		mHal1_5->setPreferredNetworkType(serial, getNetworkTypeFromRaf(raf));
		mHal1_5->setPreferredNetworkTypeBitmap(serial, raf);
		}
		return ok();
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -55,9 +55,10 @@ Return<void> RadioResponse::getPreferredNetworkTypeResponse(const V1_0::RadioRes
		}

		Return<void> RadioResponse::getPreferredNetworkTypeBitmapResponse(
		const V1_0::RadioResponseInfo& info, hidl_bitfield<V1_4::RadioAccessFamily>) {
		const V1_0::RadioResponseInfo& info,
		hidl_bitfield<V1_4::RadioAccessFamily> networkTypeBitmap) {
		LOG_CALL << info.serial;
		LOG(ERROR) << "IRadio HAL 1.4 not supported";
		networkCb()->getAllowedNetworkTypesBitmapResponse(toAidl(info), networkTypeBitmap);
		return {};
		}

		@@ -290,7 +291,7 @@ Return<void> RadioResponse::setPreferredNetworkTypeResponse(const V1_0::RadioRes
		Return<void> RadioResponse::setPreferredNetworkTypeBitmapResponse(
		const V1_0::RadioResponseInfo& info) {
		LOG_CALL << info.serial;
		LOG(ERROR) << "IRadio HAL 1.4 not supported";
		networkCb()->setAllowedNetworkTypesBitmapResponse(toAidl(info));
		return {};
		}