diff options
| author | Vishnu Nair <vishnun@google.com> | 2021-04-14 15:27:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-14 15:27:18 +0000 |
| commit | 39fff73c047804d16f04f43fbc5c5066ee23cad9 (patch) | |
| tree | bea02171424d9736789b50f7fa889edeb8a1e569 /core/java/android/view/ViewRootImpl.java | |
| parent | ce30625d474e0a419942546519698b429be03b7e (diff) | |
| parent | cbd40e683ffb9edbe2c59eea9ef804d16fc1f46e (diff) | |
Merge "Only clear SurfaceControl.Transaction when parcelling as a return value" into sc-dev
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index e8a4bb78b399..76eb882b6f53 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3906,7 +3906,10 @@ public final class ViewRootImpl implements ViewParent, mDrawsNeededToReport = 0; mWindowSession.finishDrawing(mWindow, mSurfaceChangedTransaction); } catch (RemoteException e) { - // Have fun! + Log.e(mTag, "Unable to report draw finished", e); + mSurfaceChangedTransaction.apply(); + } finally { + mSurfaceChangedTransaction.clear(); } } |