commit abe1a940727728560b7453b59837ad2edda14f87
author Winson Chung <winsonc@google.com> Tue Jun 25 15:43:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 25 15:43:48 2019 -0700
tree 9fda3f44d5ef7893c63bf7ea9920556eaae82770
parent 4f19e40705af3a4b45b1b2e90f8ace5fa6947a08
parent cff24b878d10777d57f1ccfcf43d10d41fec9a51

Merge "Catch all exceptions in onFrameDraw" into qt-dev
am: cff24b878d

Change-Id: If3aef1ccbba89a4b0964749ee3184a83f88185be

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 3016fa9..440df89 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1131,7 +1131,13 @@
      */
     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);
+                }
+            });
         }
     }