Merge "screen-off animation won't be handled by SF anymore" into jb-mr1-dev
diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp
index acce97e..8307d25 100644
--- a/services/jni/com_android_server_power_PowerManagerService.cpp
+++ b/services/jni/com_android_server_power_PowerManagerService.cpp
@@ -145,8 +145,7 @@
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) {