diff options
| author | Ben Murdoch <benm@android.com> | 2014-04-03 09:54:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 09:54:33 +0000 |
| commit | 14424043b9c20edf639004e05fe8e9264a2e66f5 (patch) | |
| tree | 8558b5af436e629950295b809b880a8df956ef8b /core | |
| parent | b386bfd791d77e24bcfe3261420f82b0a9d3851d (diff) | |
| parent | 369a00574da218975718ce07ffe6abba5c17bf92 (diff) | |
| download | frameworks_base-14424043b9c20edf639004e05fe8e9264a2e66f5.zip frameworks_base-14424043b9c20edf639004e05fe8e9264a2e66f5.tar.gz frameworks_base-14424043b9c20edf639004e05fe8e9264a2e66f5.tar.bz2 | |
am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '369a00574da218975718ce07ffe6abba5c17bf92':
Update ViewRootImpl for 64bit functor type.
Diffstat (limited to 'core')
| -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); } |