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

DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: I112e4cbab9cc6c8da12a65c3691aa1dc92bb60d4
This commit is contained in:
Ahan Wu
2020-06-03 18:22:17 +00:00
committed by Automerger Merge Worker
parent 53f1a99fa0 a3bff94e18
commit 7c459fe322
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
View File

@@ -603,7 +603,16 @@ public class ImageWallpaper extends WallpaperService {
final FloatBuffer triangleVertices = createMesh(left, top, right, bottom); final FloatBuffer triangleVertices = createMesh(left, top, right, bottom);
final int texture = loadTexture(mBackground); int texture = 0;
try {
texture = loadTexture(mBackground);
} catch (IllegalArgumentException e) {
mEgl.eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
mEgl.eglDestroyContext(mEglDisplay, mEglContext);
mEgl.eglTerminate(mEglDisplay);
return false;
}
final int program = buildProgram(sSimpleVS, sSimpleFS); final int program = buildProgram(sSimpleVS, sSimpleFS);
final int attribPosition = glGetAttribLocation(program, "position"); final int attribPosition = glGetAttribLocation(program, "position");