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

services/thermalservice/thermalserviced.cpp

+23 −21

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

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