diff options
| author | Andy McFadden <fadden@android.com> | 2012-09-28 13:06:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 13:06:45 -0700 |
| commit | 94ffe8739e2b0a9a7d2f0daa0bb90652fbdfd33b (patch) | |
| tree | af6b03eb7b45deb20fc090d99e3764bc707a80ab /services/jni | |
| parent | 053644dba95d07335853101e280cfc77c5fe6068 (diff) | |
| parent | 1081eed9b711333a29db048a492270d791beade1 (diff) | |
| download | frameworks_base-94ffe8739e2b0a9a7d2f0daa0bb90652fbdfd33b.zip frameworks_base-94ffe8739e2b0a9a7d2f0daa0bb90652fbdfd33b.tar.gz frameworks_base-94ffe8739e2b0a9a7d2f0daa0bb90652fbdfd33b.tar.bz2 | |
Merge "Pass display arg to blank/unblank" into jb-mr1-dev
Diffstat (limited to 'services/jni')
| -rw-r--r-- | services/jni/com_android_server_power_PowerManagerService.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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<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) { |