diff options
| author | Ben Murdoch <benm@android.com> | 2014-04-03 10:00:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 10:00:25 +0000 |
| commit | 55da62288dcec75c34721a59d71f917dcb8a62b4 (patch) | |
| tree | b1d115d4cbc9bb6440170bced5aa40b2e0f75ac8 /core/java/android/view/ViewRootImpl.java | |
| parent | c2cebee67a2dafe850e39b2ae3bc8b2f44426901 (diff) | |
| parent | 14424043b9c20edf639004e05fe8e9264a2e66f5 (diff) | |
| download | frameworks_base-55da62288dcec75c34721a59d71f917dcb8a62b4.zip frameworks_base-55da62288dcec75c34721a59d71f917dcb8a62b4.tar.gz frameworks_base-55da62288dcec75c34721a59d71f917dcb8a62b4.tar.bz2 | |
am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '14424043b9c20edf639004e05fe8e9264a2e66f5':
Update ViewRootImpl for 64bit functor type.
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -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 1848a8f..21657f2 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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); } |