commit 3d64ffd4a53e73c6fb4c04d6f144878ce4710d65
author vadimt <vadimt@google.com> Thu Feb 27 11:28:47 2020 -0800
committer vadimt <vadimt@google.com> Thu Feb 27 12:45:45 2020 -0800
tree 42e4d412ff978ea9c15f228e8ecc5688bc3de164
parent 3ba6800552f699f6937e7ff6d24ff66c20d6c2cc

Fixing activity leak via alarm in SecondaryDropTarget

Change-Id: I12c099ee1bb55d9db81e14d27d2eb09fbbc83e0f

src/com/android/launcher3/SecondaryDropTarget.java

diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 1dbe195..114c491 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -56,6 +56,7 @@
     private final ArrayMap<UserHandle, Boolean> mUninstallDisabledCache = new ArrayMap<>(1);
 
     private final Alarm mCacheExpireAlarm;
+    private boolean mHadPendingAlarm;
 
     protected int mCurrentAccessibilityAction = -1;
     public SecondaryDropTarget(Context context, AttributeSet attrs) {
@@ -70,6 +71,24 @@
     }
 
     @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mHadPendingAlarm) {
+            mCacheExpireAlarm.setAlarm(CACHE_EXPIRE_TIMEOUT);
+            mHadPendingAlarm = false;
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mCacheExpireAlarm.alarmPending()) {
+            mCacheExpireAlarm.cancelAlarm();
+            mHadPendingAlarm = true;
+        }
+    }
+
+    @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
         setupUi(UNINSTALL);