Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riddle Hsu
2022-07-08 02:25:46 +00:00
committed by Android (Google) Code Review
parent d4dc599bf4 14bfb89c8a
commit 456f79de0d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,18 +427,14 @@ public class RemoteTransitionCompat implements Parcelable {
mPipTransaction = null; 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 { try {
mFinishCB.onTransitionFinished(wct.isEmpty() ? null : wct, t); mFinishCB.onTransitionFinished(wct.isEmpty() ? null : wct, t);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e("RemoteTransitionCompat", "Failed to call animation finish callback", e); Log.e("RemoteTransitionCompat", "Failed to call animation finish callback", e);
t.apply(); 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) { for (int i = 0; i < mInfo.getChanges().size(); ++i) {
mInfo.getChanges().get(i).getLeash().release(); mInfo.getChanges().get(i).getLeash().release();
} }