Merge "screen-off animation won't be handled by SF anymore" into jb-mr1-dev

pixelflinger · Android (Google) Code Review · commit 187019c51fb1 · 2012-08-02T21:49:25.000-07:00
diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp
@@ -145,8 +145,7 @@ static void nativeSetPowerState(JNIEnv* env,
 
 static void nativeStartSurfaceFlingerAnimation(JNIEnv* env,
         jobject obj, jint mode) {
-    sp<ISurfaceComposer> s(ComposerService::getComposerService());
-    s->turnElectronBeamOff(mode);
+    // this is not handled by surfaceflinger anymore
 }
 
 static void nativeAcquireWakeLock(JNIEnv *env, jobject clazz, jint lock, jstring idObj) {

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ static void nativeSetPowerState(JNIEnv* env,`
`145`	`145`
`146`	`146`	`static void nativeStartSurfaceFlingerAnimation(JNIEnv* env,`
`147`	`147`	`jobject obj, jint mode) {`
`148`		`- sp<ISurfaceComposer> s(ComposerService::getComposerService());`
`149`		`- s->turnElectronBeamOff(mode);`
	`148`	`+ // this is not handled by surfaceflinger anymore`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`static void nativeAcquireWakeLock(JNIEnv *env, jobject clazz, jint lock, jstring idObj) {`