Merge "Catch all exceptions in onFrameDraw" into qt-dev

2019-06-25 22:07:44 +00:00
parent 0d83376433 b0bb2f778f
commit cff24b878d
1 changed files with 7 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1107,7 +1107,13 @@ public final class ViewRootImpl implements ViewParent,
     */
    public void registerRtFrameCallback(FrameDrawingCallback callback) {
        if (mAttachInfo.mThreadedRenderer != null) {
-            mAttachInfo.mThreadedRenderer.registerRtFrameCallback(callback);
+            mAttachInfo.mThreadedRenderer.registerRtFrameCallback(frame -> {
+                try {
+                    callback.onFrameDraw(frame);
+                } catch (Exception e) {
+                    Log.e(TAG, "Exception while executing onFrameDraw", e);
+                }
+            });
        }
    }