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

Don't initialize the hw renderer without a valid surface.

Browse Source 
Bug #3054952

Change-Id: I5b4074391dbd84b04a14f7d2fb1b9a4a2487e1e2
This commit is contained in:
Romain Guy
2010-10-25 15:29:10 -07:00
parent 98ce4a43a4
commit c361da845a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/view/ViewRoot.java
View File

@@ -822,7 +822,7 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
mDrawingAllowed = true;
}
boolean hwIntialized = false;
boolean hwInitialized = false;
boolean contentInsetsChanged = false;
boolean visibleInsetsChanged;
boolean hadSurface = mSurface.isValid();
@@ -887,7 +887,7 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
mPreviousTransparentRegion.setEmpty();
if (mAttachInfo.mHardwareRenderer != null) {
hwIntialized = mAttachInfo.mHardwareRenderer.initialize(mHolder);
hwInitialized = mAttachInfo.mHardwareRenderer.initialize(mHolder);
}
}
} else if (!mSurface.isValid()) {
@@ -935,6 +935,11 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
}
}
surfaceChanged = true;
if (mAttachInfo.mHardwareRenderer != null) {
// This will bail out early if already initialized
mAttachInfo.mHardwareRenderer.initialize(mHolder);
}
}
if (surfaceChanged) {
mSurfaceHolderCallback.surfaceChanged(mSurfaceHolder,
@@ -965,7 +970,7 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
}
}
if (hwIntialized || (windowShouldResize && mAttachInfo.mHardwareRenderer != null)) {
if (hwInitialized || (windowShouldResize && mAttachInfo.mHardwareRenderer != null)) {
mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight);
}
@@ -1795,7 +1800,8 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
boolean inTouchMode = msg.arg2 != 0;
ensureTouchModeLocally(inTouchMode);
if (mAttachInfo.mHardwareRenderer != null) {
if (mAttachInfo.mHardwareRenderer != null &&
mSurface != null && mSurface.isValid()) {
mAttachInfo.mHardwareRenderer.initializeIfNeeded(mWidth, mHeight,
mAttachInfo, mHolder);
}