Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3773188 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix race of releasing leashes with shell recents transition" into tm-qpr-dev am: 456f79de 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19201346



Change-Id: Ib49cbf203ebf645b79c4c0498ade2dee3bfc8416
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2c709c1 456f79de

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java

+2 −6
Original line number Diff line number Diff line
@@ -427,18 +427,14 @@ public class RemoteTransitionCompat implements Parcelable { 
                    mPipTransaction = null;

                }

            }

            // Release surface references now. This is apparently to free GPU

            // memory while doing quick operations (eg. during CTS).

            for (int i = 0; i < mLeashMap.size(); ++i) {

                if (mLeashMap.keyAt(i) == mLeashMap.valueAt(i)) continue;

                t.remove(mLeashMap.valueAt(i));

            }

            try {

                mFinishCB.onTransitionFinished(wct.isEmpty() ? null : wct, t);

            } catch (RemoteException e) {

                Log.e("RemoteTransitionCompat", "Failed to call animation finish callback", e);

                t.apply();

            }

            // Only release the non-local created surface references. The animator is responsible

            // for releasing the leashes created by local.

            for (int i = 0; i < mInfo.getChanges().size(); ++i) {

                mInfo.getChanges().get(i).getLeash().release();

            }