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

Merge "Prevent crash in VPN settings Bug #5217245"

Browse Source
This commit is contained in:
Romain Guy
2011-08-26 13:37:35 -07:00
committed by Android (Google) Code Review
parent 87a4d87ecf eca9b1f53c
commit 80122c2a7a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,8 +413,8 @@ public abstract class HardwareRenderer {
if (error != EGL_SUCCESS) { if (error != EGL_SUCCESS) {
// something bad has happened revert to // something bad has happened revert to
// normal rendering. // normal rendering.
fallback(error != EGL11.EGL_CONTEXT_LOST);
Log.w(LOG_TAG, "EGL error: " + GLUtils.getEGLErrorString(error)); Log.w(LOG_TAG, "EGL error: " + GLUtils.getEGLErrorString(error));
fallback(error != EGL11.EGL_CONTEXT_LOST);
} }
} }
} }
@@ -702,8 +702,9 @@ public abstract class HardwareRenderer {
@Override @Override
void setup(int width, int height) { void setup(int width, int height) {
checkCurrent(); if (validate()) {
mCanvas.setViewport(width, height); mCanvas.setViewport(width, height);
}
} }
boolean canDraw() { boolean canDraw() {

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

@@ -1352,7 +1352,7 @@ public final class ViewRootImpl extends Handler implements ViewParent,
mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer != null &&
mAttachInfo.mHardwareRenderer.isEnabled())) { mAttachInfo.mHardwareRenderer.isEnabled())) {
mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight); mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight);
if (!hwInitialized) { if (!hwInitialized && mAttachInfo.mHardwareRenderer.isEnabled()) {
mAttachInfo.mHardwareRenderer.invalidate(mHolder); mAttachInfo.mHardwareRenderer.invalidate(mHolder);
} }
} }