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

Commit 55da6228 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android Git Automerger
Browse files

am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." 

* commit '14424043':
  Update ViewRootImpl for 64bit functor type.
parents c2cebee6 14424043

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ public final class ViewRootImpl implements ViewParent, 
        mHandler.sendMessageAtFrontOfQueue(mHandler.obtainMessage(MSG_FLUSH_LAYER_UPDATES));

    }



    public boolean attachFunctor(int functor) {

    public boolean attachFunctor(long functor) {

        //noinspection SimplifiableIfStatement

        if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {

            return mAttachInfo.mHardwareRenderer.attachFunctor(mAttachInfo, functor);
@@ -664,7 +664,7 @@ public final class ViewRootImpl implements ViewParent, 
        return false;

    }



    public void detachFunctor(int functor) {

    public void detachFunctor(long functor) {

        if (mAttachInfo.mHardwareRenderer != null) {

            mAttachInfo.mHardwareRenderer.detachFunctor(functor);

        }