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

Commit e742799c authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Native-side proxy"

parents 548061e5 4f02bf4e

core/java/android/view/GLRenderer.java

+1 −3
Original line number Diff line number Diff line
@@ -1413,15 +1413,13 @@ public class GLRenderer extends HardwareRenderer { 
    }



    @Override

    boolean attachFunctor(View.AttachInfo attachInfo, int functor) {

    void attachFunctor(View.AttachInfo attachInfo, int functor) {

        if (mCanvas != null) {

            mCanvas.attachFunctor(functor);

            mFunctorsRunnable.attachInfo = attachInfo;

            attachInfo.mHandler.removeCallbacks(mFunctorsRunnable);

            attachInfo.mHandler.postDelayed(mFunctorsRunnable,  0);

            return true;

        }

        return false;

    }



    /**

core/java/android/view/HardwareRenderer.java

+1 −2
Original line number Diff line number Diff line
@@ -466,9 +466,8 @@ public abstract class HardwareRenderer { 
     * @see HardwareCanvas#callDrawGLFunction(int)

     * @see #detachFunctor(int)

     *

     * @return true if the functor was attached successfully

     */

    abstract boolean attachFunctor(View.AttachInfo attachInfo, int functor);

    abstract void attachFunctor(View.AttachInfo attachInfo, int functor);



    /**

     * Initializes the hardware renderer for the specified surface and setup the