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

Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev

Browse Source
This commit is contained in:
Wu Ahan
2020-06-03 18:08:35 +00:00
committed by Android (Google) Code Review
parent 1e8240d82f a3bff94e18
commit c34919e166
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 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 attribPosition = glGetAttribLocation(program, "position");