From ff8b387710e42fff6eeaf714ae965806762a7704 Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Fri, 31 Jan 2025 15:58:50 -0800 Subject: Revert "Make sure Bitmap for PiP overlay being recycled" This reverts commit ce298705433b7fccbd084c4fbb3aadc911b6a1eb. Reason for revert: b/393584443 to proceed with another approach Change-Id: I3fbf21f782824bed1bb65420b2a482636bc854c0 --- .../com/android/wm/shell/shared/pip/PipContentOverlay.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java index 9f0c7322dfff..62ca5c687a2a 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java @@ -169,8 +169,6 @@ public abstract class PipContentOverlay { // The maximum size for app icon in pixel. private static final int MAX_APP_ICON_SIZE_DP = 72; - private static final long RECYCLE_BITMAP_TIMEOUT_MILLIS = 2_000; - private final Context mContext; private final int mAppIconSizePx; /** @@ -233,12 +231,6 @@ public abstract class PipContentOverlay { tx.setAlpha(mLeash, 0f); tx.reparent(mLeash, parentLeash); tx.apply(); - - // Recycle the mBitmap as a last resort. - if (mContext.getMainThreadHandler() != null) { - mContext.getMainThreadHandler().postDelayed( - this::safeRecycle, RECYCLE_BITMAP_TIMEOUT_MILLIS); - } } @Override @@ -264,10 +256,6 @@ public abstract class PipContentOverlay { @Override public void detach(SurfaceControl.Transaction tx) { super.detach(tx); - safeRecycle(); - } - - private void safeRecycle() { if (mBitmap != null && !mBitmap.isRecycled()) { mBitmap.recycle(); } -- cgit v1.2.3-59-g8ed1b