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

Commit c3e9a90b authored by Leon Scroggins's avatar Leon Scroggins
Browse files

Revert "Allow changing composition from DISPLAY_DECORATION to DEVICE" 

Revert submission 16511727-wm_DISPLAY_DECORATION

Reason for revert: b/211835607
Reverted Changes:
I1da3199ba:Allow changing composition from DISPLAY_DECORATION...
I1fae74b36:Update documentation for DISPLAY_DECORATION
I1da03a88f:Add eLayerIsDisplayDecoration flag
I7f22dfd03:Add/plumb SurfaceControl.DISPLAY_DECORATION

Change-Id: Ifa4d06453b5707626c614aad203c727681e23fed
parent 8ece902d

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -685,12 +685,12 @@ void OutputLayer::detectDisallowedCompositionTypeChange(Composition from, Compos 




        case Composition::DEVICE:

        case Composition::DEVICE:

        case Composition::SOLID_COLOR:

        case Composition::SOLID_COLOR:

        case Composition::DISPLAY_DECORATION:

            result = (to == Composition::CLIENT);

            result = (to == Composition::CLIENT);

            break;

            break;





        case Composition::CURSOR:

        case Composition::CURSOR:

        case Composition::SIDEBAND:

        case Composition::SIDEBAND:

        case Composition::DISPLAY_DECORATION:

            result = (to == Composition::CLIENT || to == Composition::DEVICE);

            result = (to == Composition::CLIENT || to == Composition::DEVICE);

            break;

            break;

    }

    }