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

Merge "Pass display arg to blank/unblank" into jb-mr1-dev

Browse Source
This commit is contained in:
Andy McFadden
2012-09-28 13:06:44 -07:00
committed by Android (Google) Code Review
parent 053644dba9 1081eed9b7
commit 94ffe8739e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/jni/com_android_server_power_PowerManagerService.cpp
View File

@@ -183,14 +183,16 @@ static void nativeSetScreenState(JNIEnv *env, jclass clazz, jboolean on) {
gPowerModule->setInteractive(gPowerModule, true);
}
const sp<IBinder>& display = s->getBuiltInDisplay(0); // TODO: support multiple displays
{
ALOGD_IF_SLOW(100, "Excessive delay in unblank() while turning screen on");
s->unblank();
s->unblank(display);
}
} else {
const sp<IBinder>& display = s->getBuiltInDisplay(0); // TODO: support multiple displays
{
ALOGD_IF_SLOW(100, "Excessive delay in blank() while turning screen off");
s->blank();
s->blank(display);
}
if (gPowerModule) {