am 198a2b02: am 97bf518f: Merge "Reduce wasted buffer allocations" into mnc-dev

* commit '198a2b02f0b9f657f0c56fc067dabf15ed29d3ef':
  Reduce wasted buffer allocations
This commit is contained in:
John Reck
2015-05-20 14:41:11 +00:00
committed by Android Git Automerger
2 changed files with 9 additions and 1 deletions

View File

@@ -148,7 +148,6 @@ public class ThreadedRenderer extends HardwareRenderer {
mInitialized = true;
updateEnabledState(surface);
boolean status = nInitialize(mNativeProxy, surface);
surface.allocateBuffers();
return status;
}

View File

@@ -1705,10 +1705,19 @@ public final class ViewRootImpl implements ViewParent,
mFullRedrawNeeded = true;
mPreviousTransparentRegion.setEmpty();
// Only initialize up-front if transparent regions are not
// requested, otherwise defer to see if the entire window
// will be transparent
if (mAttachInfo.mHardwareRenderer != null) {
try {
hwInitialized = mAttachInfo.mHardwareRenderer.initialize(
mSurface);
if (hwInitialized && (host.mPrivateFlags
& View.PFLAG_REQUEST_TRANSPARENT_REGIONS) == 0) {
// Don't pre-allocate if transparent regions
// are requested as they may not be needed
mSurface.allocateBuffers();
}
} catch (OutOfResourcesException e) {
handleOutOfResourcesException(e);
return;