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

fadden · Android (Google) Code Review · commit 94ffe8739e2b · 2012-09-28T13:06:45.000-07:00
diff --git 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<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) {

Original file line number	Diff line number	Diff line change
`@@ -183,14 +183,16 @@ static void nativeSetScreenState(JNIEnv *env, jclass clazz, jboolean on) {`
`183`	`183`	`gPowerModule->setInteractive(gPowerModule, true);`
`184`	`184`	`}`
`185`	`185`
	`186`	`+ const sp<IBinder>& display = s->getBuiltInDisplay(0); // TODO: support multiple displays`
`186`	`187`	`{`
`187`	`188`	`ALOGD_IF_SLOW(100, "Excessive delay in unblank() while turning screen on");`
`188`		`- s->unblank();`
	`189`	`+ s->unblank(display);`
`189`	`190`	`}`
`190`	`191`	`} else {`
	`192`	`+ const sp<IBinder>& display = s->getBuiltInDisplay(0); // TODO: support multiple displays`
`191`	`193`	`{`
`192`	`194`	`ALOGD_IF_SLOW(100, "Excessive delay in blank() while turning screen off");`
`193`		`- s->blank();`
	`195`	`+ s->blank(display);`
`194`	`196`	`}`
`195`	`197`
`196`	`198`	`if (gPowerModule) {`