tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "health: drop backup instance for non-recovery." am: c900d6f20e am: 80d053dcb1 am: 5dadc03362 am: 84c24239f7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861817

Change-Id: Iad3d79024cea8637b3f2b20a8248c41298634007
This commit is contained in:
Treehugger Robot 2021-10-19 21:18:03 +00:00 committed by Automerger Merge Worker
commit d665a05e5f
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
health/2.0/utils/libhealthhalutils/HealthHalUtils.cpp
View file

@ -25,7 +25,26 @@ namespace health {
namespace V2_0 { namespace V2_0 {
sp<IHealth> get_health_service() { sp<IHealth> get_health_service() {
for (auto&& instanceName : {"default", "backup"}) { // For the core and vendor variant, the "backup" instance points to healthd,
// which is removed.
// For the recovery variant, the "backup" instance has a different
// meaning. It points to android.hardware.health@2.0-impl-default.recovery
// which was assumed by OEMs to be always installed when a
// vendor-specific libhealthd is not necessary. Hence, its behavior
// is kept. See health/2.0/README.md.
// android.hardware.health@2.0-impl-default.recovery, and subsequently the
// special handling of recovery mode below, can be removed once health@2.1
// is the minimum required version (i.e. compatibility matrix level 5 is the
// minimum supported level). Health 2.1 requires OEMs to install the
// implementation to the recovery partition when it is necessary (i.e. on
// non-A/B devices, where IsBatteryOk() is needed in recovery).
for (auto&& instanceName :
#ifdef __ANDROID_RECOVERY__
{ "default", "backup" }
#else
{"default"}
#endif
) {
auto ret = IHealth::getService(instanceName); auto ret = IHealth::getService(instanceName);
if (ret != nullptr) { if (ret != nullptr) {
return ret; return ret;