commit 55da62288dcec75c34721a59d71f917dcb8a62b4
author Ben Murdoch <benm@android.com> Thu Apr 03 10:00:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 03 10:00:25 2014 +0000
tree b1d115d4cbc9bb6440170bced5aa40b2e0f75ac8
parent c2cebee67a2dafe850e39b2ae3bc8b2f44426901
parent 14424043b9c20edf639004e05fe8e9264a2e66f5

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

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

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 1848a8f97..21657f2 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -656,7 +656,7 @@
         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 @@
         return false;
     }
 
-    public void detachFunctor(int functor) {
+    public void detachFunctor(long functor) {
         if (mAttachInfo.mHardwareRenderer != null) {
             mAttachInfo.mHardwareRenderer.detachFunctor(functor);
         }