Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5363df75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PMS: remove log spam when connecting power HAL" into rvc-dev am: 140eb142 

Change-Id: Ice2e39f0ef75b7347b6bb910e3613a720c1d1c49
parents 80ba8140 140eb142

services/core/jni/com_android_server_power_PowerManagerService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static HalVersion connectPowerHalLocked() { 
            gPowerHalAidl_ = waitForVintfService<IPowerAidl>();

        }

        if (gPowerHalAidl_) {

            ALOGI("Successfully connected to Power HAL AIDL service.");

            ALOGV("Successfully connected to Power HAL AIDL service.");

            return HalVersion::AIDL;

        } else {

            gPowerHalAidlExists = false;
@@ -123,14 +123,14 @@ static HalVersion connectPowerHalLocked() { 
    if (gPowerHalHidlExists && gPowerHalHidlV1_0_ == nullptr) {

        gPowerHalHidlV1_0_ = IPowerV1_0::getService();

        if (gPowerHalHidlV1_0_) {

            ALOGI("Successfully connected to Power HAL HIDL 1.0 service.");

            ALOGV("Successfully connected to Power HAL HIDL 1.0 service.");

            // Try cast to powerHAL HIDL V1_1

            gPowerHalHidlV1_1_ = IPowerV1_1::castFrom(gPowerHalHidlV1_0_);

            if (gPowerHalHidlV1_1_) {

                ALOGI("Successfully connected to Power HAL HIDL 1.1 service.");

                ALOGV("Successfully connected to Power HAL HIDL 1.1 service.");

            }

        } else {

            ALOGI("Couldn't load power HAL HIDL service");

            ALOGV("Couldn't load power HAL HIDL service");

            gPowerHalHidlExists = false;

            return HalVersion::NONE;

        }