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

Commit c1f8a7f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use android::power namespace for power manager lib"

parents 6e9eaa35 363f2388

services/core/jni/com_android_server_am_BatteryStatsService.cpp

+5 −5
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static bool checkPowerStatsHalResultLocked(const Return<void>& ret, const char* 
static bool checkPowerHalResult(const Return<void>& ret, const char* function) {

    if (!ret.isOk()) {

        ALOGE("%s failed: requested HAL service not available.", function);

        PowerHalLoader::unloadAll();

        power::PowerHalLoader::unloadAll();

        return false;

    }

    return true;
@@ -605,7 +605,7 @@ static void getPowerStatsHalRailEnergyDataLocked(JNIEnv* env, jobject jrailStats 
}



static void getPowerHalLowPowerData(JNIEnv* env, jobject jrpmStats) {

    sp<IPowerV1_0> powerHalV1_0 = PowerHalLoader::loadHidlV1_0();

    sp<IPowerV1_0> powerHalV1_0 = power::PowerHalLoader::loadHidlV1_0();

    if (powerHalV1_0 == nullptr) {

        ALOGE("Power Hal not loaded");

        return;
@@ -643,7 +643,7 @@ static void getPowerHalLowPowerData(JNIEnv* env, jobject jrpmStats) { 
    }



    // Trying to get IPower 1.1, this will succeed only for devices supporting 1.1

    sp<IPowerV1_1> powerHal_1_1 = PowerHalLoader::loadHidlV1_1();

    sp<IPowerV1_1> powerHal_1_1 = power::PowerHalLoader::loadHidlV1_1();

    if (powerHal_1_1 == nullptr) {

        // This device does not support IPower@1.1, exiting gracefully

        return;
@@ -684,7 +684,7 @@ static jint getPowerHalPlatformData(JNIEnv* env, jobject outBuf) { 
    int total_added = -1;



    {

        sp<IPowerV1_0> powerHalV1_0 = PowerHalLoader::loadHidlV1_0();

        sp<IPowerV1_0> powerHalV1_0 = power::PowerHalLoader::loadHidlV1_0();

        if (powerHalV1_0 == nullptr) {

            ALOGE("Power Hal not loaded");

            return -1;
@@ -762,7 +762,7 @@ static jint getPowerHalSubsystemData(JNIEnv* env, jobject outBuf) { 


    {

        // Trying to get 1.1, this will succeed only for devices supporting 1.1

        powerHal_1_1 = PowerHalLoader::loadHidlV1_1();

        powerHal_1_1 = power::PowerHalLoader::loadHidlV1_1();

        if (powerHal_1_1 == nullptr) {

            //This device does not support IPower@1.1, exiting gracefully

            return 0;

services/core/jni/com_android_server_power_PowerManagerService.cpp

+2 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


#include <nativehelper/ScopedUtfChars.h>

#include <powermanager/PowerHalController.h>

#include <powermanager/PowerHalLoader.h>



#include <limits.h>
@@ -70,7 +69,7 @@ static struct { 
// ----------------------------------------------------------------------------



static jobject gPowerManagerServiceObj;

static PowerHalController gPowerHalController;

static power::PowerHalController gPowerHalController;

static nsecs_t gLastEventTime[USER_ACTIVITY_EVENT_LAST + 1];



// Throttling interval for user activity calls.
@@ -100,7 +99,7 @@ static bool setPowerMode(Mode mode, bool enabled) { 
        ALOGD("Excessive delay in setting interactive mode to %s while turning screen %s",

              enabled ? "true" : "false", enabled ? "on" : "off");

    }

    return result == PowerHalResult::SUCCESSFUL;

    return result == power::HalResult::SUCCESSFUL;

}



void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType) {