Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ea016ff authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 187019c5: Merge "screen-off animation won\'t be handled by SF anymore" into jb-mr1-dev 

* commit '187019c5':
  screen-off animation won't be handled by SF anymore
parents 6da0299d 187019c5

services/jni/com_android_server_power_PowerManagerService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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) {