Snap for 6269144 from b8c5a0f93636821804b03144a7a91426b69005ff to rvc-release (bde00465) · Commits · e / os / android_hardware_qcom_audio

hal/audio_perf.cpp

+15 −15

Original line number	Diff line number	Diff line
		@@ -54,6 +54,21 @@ static hal_version connectPowerHalLocked() {
		return NONE;
		}

		if (gPowerHalHidlExists) {
		// (re)connect if handle is null
		if (!gPowerHal_1_2_) {
		gPowerHal_1_2_ =
		android::hardware::power::V1_2::IPower::getService();
		}
		if (gPowerHal_1_2_) {
		ALOGI("Successfully connected to Power Hal Hidl service.");
		return HIDL_1_2;
		} else {
		// no more try on this handle
		gPowerHalHidlExists = false;
		}
		}

		if (gPowerHalAidlExists) {
		// (re)connect if handle is null
		if (!gPowerHal_Aidl_) {
		@@ -70,21 +85,6 @@ static hal_version connectPowerHalLocked() {
		}
		}

		if (gPowerHalHidlExists) {
		// (re)connect if handle is null
		if (!gPowerHal_1_2_) {
		gPowerHal_1_2_ =
		android::hardware::power::V1_2::IPower::getService();
		}
		if (gPowerHal_1_2_) {
		ALOGI("Successfully connected to Power Hal Hidl service.");
		return HIDL_1_2;
		} else {
		// no more try on this handle
		gPowerHalHidlExists = false;
		}
		}

		return NONE;
		}