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

* commit '369a00574da218975718ce07ffe6abba5c17bf92':
  Update ViewRootImpl for 64bit functor type.
This commit is contained in:
Ben Murdoch
2014-04-03 09:54:33 +00:00
committed by Android Git Automerger

View File

@@ -660,7 +660,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);
@@ -668,7 +668,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);
}