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

* commit '14424043b9c20edf639004e05fe8e9264a2e66f5':
  Update ViewRootImpl for 64bit functor type.
This commit is contained in:
Ben Murdoch
2014-04-03 10:00:25 +00:00
committed by Android Git Automerger

View File

@@ -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);
}