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

Commit d4d46587 authored by Colin Cross's avatar Colin Cross
Browse files

resolved conflicts for merge of 90b39aba to master-lockscreen-dev 

Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b
parents 923914bc 90b39aba

tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -460,13 +460,13 @@ public class IWindowManagerImpl implements IWindowManager { 
    }



    @Override

    public boolean clearWindowContentRenderStats(IBinder token) throws RemoteException {

    public boolean clearWindowContentFrameStats(IBinder token) throws RemoteException {

        // TODO Auto-generated method stub

        return false;

    }



    @Override

    public WindowContentFrameStats getWindowContentRenderStats(IBinder token)

    public WindowContentFrameStats getWindowContentFrameStats(IBinder token)

            throws RemoteException {

        // TODO Auto-generated method stub

        return null;