From 1081eed9b711333a29db048a492270d791beade1 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Thu, 27 Sep 2012 16:01:27 -0700 Subject: Pass display arg to blank/unblank blank() and unblank() now take a display argument. For now, just pass the default display in. Bug: 7240511 Change-Id: I7747732471c9116cb6b3686bd95d5f32a63279a6 --- services/jni/com_android_server_power_PowerManagerService.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'services/jni') diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp index 38af38d..dcc2b58 100644 --- a/services/jni/com_android_server_power_PowerManagerService.cpp +++ b/services/jni/com_android_server_power_PowerManagerService.cpp @@ -183,14 +183,16 @@ static void nativeSetScreenState(JNIEnv *env, jclass clazz, jboolean on) { gPowerModule->setInteractive(gPowerModule, true); } + const sp& 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& 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) { -- cgit v1.1