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

Commit deab4f0a authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev 

am: 22ec7b0c

Change-Id: I4106fe3fda23727fee6e10e2721cf707b44ce57d
parents a6465a13 22ec7b0c

services/core/jni/com_android_server_power_PowerManagerService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -157,8 +157,10 @@ static void nativeReleaseSuspendBlocker(JNIEnv *env, jclass /* clazz */, jstring 
static void nativeSetInteractive(JNIEnv* /* env */, jclass /* clazz */, jboolean enable) {

    std::lock_guard<std::mutex> lock(gPowerHalMutex);

    if (getPowerHal()) {

        String8 err("Excessive delay in setInteractive(%s) while turning screen %s");

        ALOGD_IF_SLOW(20, String8::format(err, enable ? "true" : "false", enable ? "on" : "off"));

        String8 err = String8::format(

                "Excessive delay in setInteractive(%s) while turning screen %s",

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

        ALOGD_IF_SLOW(20, err);

        Return<void> ret = gPowerHal->setInteractive(enable);

        processReturn(ret, "setInteractive");

    }