diff options
| author | Joe Onorato <joeo@android.com> | 2010-10-14 17:57:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 17:57:32 -0700 |
| commit | 258d0e805ee63685b807b5dae43efc5ecc97179e (patch) | |
| tree | 1c8905712416f6110992572277b0c44bb66b0b05 /services/jni | |
| parent | fd28b45125f7d58a9d88c0dd09fe610f6e5878df (diff) | |
| parent | 0d65a3fc075b7dbdbfaba6b570217d87e307d75f (diff) | |
| download | frameworks_base-258d0e805ee63685b807b5dae43efc5ecc97179e.zip frameworks_base-258d0e805ee63685b807b5dae43efc5ecc97179e.tar.gz frameworks_base-258d0e805ee63685b807b5dae43efc5ecc97179e.tar.bz2 | |
am 0d65a3fc: Merge "Screen on/off animation tweaks" into gingerbread
Merge commit '0d65a3fc075b7dbdbfaba6b570217d87e307d75f' into gingerbread-plus-aosp
* commit '0d65a3fc075b7dbdbfaba6b570217d87e307d75f':
Screen on/off animation tweaks
Diffstat (limited to 'services/jni')
| -rw-r--r-- | services/jni/com_android_server_PowerManagerService.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/jni/com_android_server_PowerManagerService.cpp b/services/jni/com_android_server_PowerManagerService.cpp index 2ec20bd..705be60 100644 --- a/services/jni/com_android_server_PowerManagerService.cpp +++ b/services/jni/com_android_server_PowerManagerService.cpp @@ -125,9 +125,9 @@ static void android_server_PowerManagerService_nativeSetPowerState(JNIEnv* env, } static void android_server_PowerManagerService_nativeStartSurfaceFlingerAnimation(JNIEnv* env, - jobject obj) { + jobject obj, jint mode) { sp<ISurfaceComposer> s(ComposerService::getComposerService()); - s->turnElectronBeamOff(0); + s->turnElectronBeamOff(mode); } // ---------------------------------------------------------------------------- @@ -138,7 +138,7 @@ static JNINativeMethod gPowerManagerServiceMethods[] = { (void*) android_server_PowerManagerService_nativeInit }, { "nativeSetPowerState", "(ZZ)V", (void*) android_server_PowerManagerService_nativeSetPowerState }, - { "nativeStartSurfaceFlingerAnimation", "()V", + { "nativeStartSurfaceFlingerAnimation", "(I)V", (void*) android_server_PowerManagerService_nativeStartSurfaceFlingerAnimation }, }; |