Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-21 18:26:53 +00:00
committed by Android (Google) Code Review
parent 77dea6284a 0d12f7a427
commit 22ec7b0c46
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/jni/com_android_server_power_PowerManagerService.cpp
View File

@@ -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");
}