diff options
| author | Vishnu Nair <vishnun@google.com> | 2021-04-12 18:31:52 -0700 |
|---|---|---|
| committer | Vishnu Nair <vishnun@google.com> | 2021-04-12 18:31:52 -0700 |
| commit | cbd40e683ffb9edbe2c59eea9ef804d16fc1f46e (patch) | |
| tree | 75abc4271faf71c32d4c5cddb6dd0118004aa019 /core/java/android/view/ViewRootImpl.java | |
| parent | 9ad3b820bef9de56d1e07f9857bddaeaf2df768a (diff) | |
Only clear SurfaceControl.Transaction when parcelling as a return value
Fix this by have writeToParcel respect PARCELABLE_WRITE_RETURN_VALUE.
Fixes: b/185178151
Test: go/wm-smoke
Change-Id: Ic146d1bbb9a68be6c4f4fea10c65f81b1b36d760
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 e2cf9624e1a5..b12e464d8dae 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3901,7 +3901,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(); } } |