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

am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev

Browse Source 
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
  Resume RT-animations after a pauseSurface
This commit is contained in:
John Reck
2014-12-04 15:15:27 +00:00
committed by Android Git Automerger
parent 4eb896ef01 bd15e4f59c
commit a51a0901ad
10 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/HardwareRenderer.java
View File

@@ -235,7 +235,7 @@ public abstract class HardwareRenderer {
* or not the surface used by the HardwareRenderer will be changing. It
* Suspends any rendering into the surface, but will not do any destruction
*/
abstract void pauseSurface(Surface surface);
abstract boolean pauseSurface(Surface surface);
/**
* Destroys all hardware rendering resources associated with the specified

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

@@ -155,8 +155,8 @@ public class ThreadedRenderer extends HardwareRenderer {
}
@Override
void pauseSurface(Surface surface) {
nPauseSurface(mNativeProxy, surface);
boolean pauseSurface(Surface surface) {
return nPauseSurface(mNativeProxy, surface);
}
@Override
@@ -494,7 +494,7 @@ public class ThreadedRenderer extends HardwareRenderer {
private static native boolean nInitialize(long nativeProxy, Surface window);
private static native void nUpdateSurface(long nativeProxy, Surface window);
private static native void nPauseSurface(long nativeProxy, Surface window);
private static native boolean nPauseSurface(long nativeProxy, Surface window);
private static native void nSetup(long nativeProxy, int width, int height,
float lightX, float lightY, float lightZ, float lightRadius,
int ambientShadowAlpha, int spotShadowAlpha);

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

@@ -1493,7 +1493,11 @@ public final class ViewRootImpl implements ViewParent,
// relayoutWindow may decide to destroy mSurface. As that decision
// happens in WindowManager service, we need to be defensive here
// and stop using the surface in case it gets destroyed.
mAttachInfo.mHardwareRenderer.pauseSurface(mSurface);
if (mAttachInfo.mHardwareRenderer.pauseSurface(mSurface)) {
// Animations were running so we need to push a frame
// to resume them
mDirty.set(0, 0, mWidth, mHeight);
}
}
final int surfaceGenerationId = mSurface.getGenerationId();
relayoutResult = relayoutWindow(params, viewVisibility, insetsPending);