diff options
| author | Joe Onorato <joeo@android.com> | 2010-10-16 08:59:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 08:59:20 -0700 |
| commit | b25d5be54b7d876aa2b445584b829a410b50e034 (patch) | |
| tree | f8c235efeaf84cb219d7e3b053db7ed82c80c023 /services/jni | |
| parent | 2c3a7869ccf00782846d9e9ae813df8ba13ff40b (diff) | |
| parent | 258d0e805ee63685b807b5dae43efc5ecc97179e (diff) | |
| download | frameworks_base-b25d5be54b7d876aa2b445584b829a410b50e034.zip frameworks_base-b25d5be54b7d876aa2b445584b829a410b50e034.tar.gz frameworks_base-b25d5be54b7d876aa2b445584b829a410b50e034.tar.bz2 | |
am 258d0e80: am 0d65a3fc: Merge "Screen on/off animation tweaks" into gingerbread
Merge commit '258d0e805ee63685b807b5dae43efc5ecc97179e'
* commit '258d0e805ee63685b807b5dae43efc5ecc97179e':
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 }, }; |