Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some edge cases" into nyc-dev am: 4a62eff

Browse Source 
am: c01a9b6

* commit 'c01a9b6a9ba2662fafa6f4152ca9986faacd2d66':
  Fix some edge cases

Change-Id: I52d65ed7c5da33b33a4f98953800c1dedea2bf09
This commit is contained in:
John Reck
2016-04-07 23:15:52 +00:00
committed by android-build-merger
parent c324bf2514 c01a9b6a9b
commit 4e2838ead6
17 changed files with 115 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/ThreadedRenderer.java
View File

@@ -794,8 +794,7 @@ public final class ThreadedRenderer {
}
final long[] frameInfo = choreographer.mFrameInfo.mFrameInfo;
int syncResult = nSyncAndDrawFrame(mNativeProxy, frameInfo, frameInfo.length,
mRootNode.mNativeRenderNode);
int syncResult = nSyncAndDrawFrame(mNativeProxy, frameInfo, frameInfo.length);
if ((syncResult & SYNC_LOST_SURFACE_REWARD_IF_FOUND) != 0) {
setEnabled(false);
attachInfo.mViewRootImpl.mSurface.release();
@@ -994,8 +993,7 @@ public final class ThreadedRenderer {
private static native void nSetLightCenter(long nativeProxy,
float lightX, float lightY, float lightZ);
private static native void nSetOpaque(long nativeProxy, boolean opaque);
private static native int nSyncAndDrawFrame(long nativeProxy, long[] frameInfo, int size,
long rootRenderNode);
private static native int nSyncAndDrawFrame(long nativeProxy, long[] frameInfo, int size);
private static native void nDestroy(long nativeProxy, long rootRenderNode);
private static native void nRegisterAnimatingRenderNode(long rootRenderNode, long animatingNode);