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

Commit 7f03dde7 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 am: b34f89c3 

Change-Id: If1cb7d3a4b23fe30483fa6fd54dceb385732c175
parents ff53ebde b34f89c3

services/core/jni/com_android_server_power_PowerManagerService.cpp

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

            gPowerHalAidl_ = waitForVintfService<IPowerAidl>();

        }

        }

        if (gPowerHalAidl_) {

        if (gPowerHalAidl_) {

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

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

            return HalVersion::AIDL;

            return HalVersion::AIDL;

        } else {

        } else {

            gPowerHalAidlExists = false;

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

    if (gPowerHalHidlExists && gPowerHalHidlV1_0_ == nullptr) {

        gPowerHalHidlV1_0_ = IPowerV1_0::getService();

        gPowerHalHidlV1_0_ = IPowerV1_0::getService();

        if (gPowerHalHidlV1_0_) {

        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

            // Try cast to powerHAL HIDL V1_1

            gPowerHalHidlV1_1_ = IPowerV1_1::castFrom(gPowerHalHidlV1_0_);

            gPowerHalHidlV1_1_ = IPowerV1_1::castFrom(gPowerHalHidlV1_0_);

            if (gPowerHalHidlV1_1_) {

            if (gPowerHalHidlV1_1_) {

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

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

            }

            }

        } else {

        } else {

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

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

            gPowerHalHidlExists = false;

            gPowerHalHidlExists = false;

            return HalVersion::NONE;

            return HalVersion::NONE;

        }

        }