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

Commit f9ab1f64 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Steve Kondik
Browse files

surfaceflinger: Fix a couple of mergefails 

Change-Id: I2ba25281bfd2c991f07623a200152df019b0b8c9
parent 63f53194

services/surfaceflinger/DisplayDevice.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -95,6 +95,7 @@ DisplayDevice::DisplayDevice( 
      mLayerStack(NO_LAYER_STACK),

      mLayerStack(NO_LAYER_STACK),

      mOrientation()

      mOrientation()

{

{

    mNativeWindow = new Surface(mDisplaySurface->getIGraphicBufferProducer());

#ifndef BOARD_EGL_NEEDS_LEGACY_FB

#ifndef BOARD_EGL_NEEDS_LEGACY_FB

    ANativeWindow* const window = mNativeWindow.get();

    ANativeWindow* const window = mNativeWindow.get();

#else

#else

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -858,8 +858,6 @@ status_t HWComposer::commit() { 
            }

            }

        }

        }





        err = mHwc->set(mHwc, mNumDisplays, mLists);



        for (size_t i=0 ; i<mNumDisplays ; i++) {

        for (size_t i=0 ; i<mNumDisplays ; i++) {

            DisplayData& disp(mDisplayData[i]);

            DisplayData& disp(mDisplayData[i]);

            disp.lastDisplayFence = disp.lastRetireFence;

            disp.lastDisplayFence = disp.lastRetireFence;