diff options
| author | Ben Murdoch <benm@android.com> | 2014-04-03 09:48:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-03 09:48:43 +0000 |
| commit | 369a00574da218975718ce07ffe6abba5c17bf92 (patch) | |
| tree | 50b31be0336df0951c452f2f62201a5d65df761d | |
| parent | 89dddcc948cb3e826bfddeefae73066849aba0fc (diff) | |
| parent | cf61c9b71faa053f407430fde043b4672c501340 (diff) | |
| download | frameworks_base-369a00574da218975718ce07ffe6abba5c17bf92.zip frameworks_base-369a00574da218975718ce07ffe6abba5c17bf92.tar.gz frameworks_base-369a00574da218975718ce07ffe6abba5c17bf92.tar.bz2 | |
Merge "Update ViewRootImpl for 64bit functor type."
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index bc0d7e3..3fd2aa9 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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); } |