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

Commit 4c9d05ed authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Workaround for blackscreen after unlock with electron beam." into gingerbread

parents 3179a768 bd6f7102

services/surfaceflinger/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ ifeq ($(TARGET_USES_16BPPSURFACE_FOR_OPAQUE), true) 
	LOCAL_CFLAGS += -DUSE_16BPPSURFACE_FOR_OPAQUE

endif



ifeq ($(TARGET_DO_NOT_SETS_CAN_DRAW), true)

    LOCAL_CFLAGS += -DDO_NOT_SET_CAN_DRAW

endif



ifeq ($(BOARD_NO_RGBX_8888), true)

	LOCAL_CFLAGS += -DNO_RGBX_8888

endif

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2022,7 +2022,9 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked(int32_t mode) 
    glEnable(GL_SCISSOR_TEST);

    hw.flip( Region(hw.bounds()) );



#ifndef DO_NOT_SET_CAN_DRAW

    hw.setCanDraw(false);

#endif

    return NO_ERROR;

}