Merge "Fix thermalservice crash on ThermalHAL 1.1" (9d859ebf) · Commits · e / os / android_frameworks_native-old

services/thermalservice/thermalserviced.cpp

+23 −21

Original line number	Diff line number	Diff line
		@@ -109,8 +109,7 @@ void ThermalServiceDaemon::getThermalHal() {
		SLOGE("registerThermalCallback failed, status: %s", ret.description().c_str());
		}
		}
		}

		} else {
		if (gThermalHalDied != nullptr) {
		gThermalHal2_0->linkToDeath(gThermalHalDied, 0x451F /* cookie */);
		}
		@@ -118,19 +117,22 @@ void ThermalServiceDaemon::getThermalHal() {
		if (mThermalCallback != nullptr) {
		Return<void> ret =
		gThermalHal2_0
		->registerThermalChangedCallback(
		mThermalChangedCallback,
		false,
		->registerThermalChangedCallback(mThermalChangedCallback, false,
		TemperatureType::SKIN, // not used
		[](ThermalStatus status) {
		if (ThermalStatusCode::SUCCESS !=
		status.code) {
		SLOGE("registerThermalChangedCallback failed, status: %s",
		status.debugMessage.c_str());
		SLOGE("registerThermalChangedC"
		"allback failed, "
		"status: %s",
		status.debugMessage
		.c_str());
		}
		});
		if (!ret.isOk()) {
		SLOGE("registerThermalChangedCallback failed, status: %s", ret.description().c_str());
		SLOGE("registerThermalChangedCallback failed, status: %s",
		ret.description().c_str());
		}
		}
		}
		}