提交: 71be05dc5d419aacd0d42484f7b6d2f44907e818 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: 71be05dc5d419aacd0d42484f7b6d2f44907e818 (tree)
• 时间: 2020-06-05 03:25:48
• 作者: Ahan Wu <ahanwu@goog...>
• Commiter: Anis Assi

Log Message

DO NOT MERGE Prevent ImageWallpaper from keeping crashing

GLUtil.texImage2D may throw exception that indicates bad image format.
We should catch this exception, otherwise, systemui may keep crashing.

Bug: 156087409
Test: Set a 16-bit rgb image as wallpaper
Test: Systemui shouldn't keep crashing
Change-Id: I6c9715c049b7848ecd5559ab76612a98dcd4ee6f
(cherry picked from commit a3bff94e184590351fd95f630e8b8313d1d2053b)

更改概述

• modified: packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

差异

--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -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");