Merge "ChooserActivity: return missing ResolverActivity onDestroy logic" into main

3 files changed, 45 insertions, 14 deletions

diff --git a/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java b/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java
index f3804154..963091b5 100644
--- a/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java
+++ b/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java
@@ -28,6 +28,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.metrics.LogMaker;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
@@ -48,6 +49,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
 import com.google.android.collect.Lists;
 
+import java.lang.ref.WeakReference;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -392,20 +394,7 @@ public class ResolverRankerServiceResolverComparator extends AbstractResolverCom
         }
 
         public final IResolverRankerResult resolverRankerResult =
-                new IResolverRankerResult.Stub() {
-            @Override
-            public void sendResult(List<ResolverTarget> targets) throws RemoteException {
-                if (DEBUG) {
-                    Log.d(TAG, "Sending Result back to Resolver: " + targets);
-                }
-                synchronized (mLock) {
-                    final Message msg = Message.obtain();
-                    msg.what = RANKER_SERVICE_RESULT;
-                    msg.obj = targets;
-                    mHandler.sendMessage(msg);
-                }
-            }
-        };
+                new ResolverRankerResultCallback(mLock, mHandler);
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
@@ -437,6 +426,32 @@ public class ResolverRankerServiceResolverComparator extends AbstractResolverCom
         }
     }
 
+    private static class ResolverRankerResultCallback extends IResolverRankerResult.Stub {
+        private final Object mLock;
+        private final WeakReference<Handler> mHandlerRef;
+
+        private ResolverRankerResultCallback(Object lock, Handler handler) {
+            mLock = lock;
+            mHandlerRef = new WeakReference<>(handler);
+        }
+
+        @Override
+        public void sendResult(List<ResolverTarget> targets) throws RemoteException {
+            if (DEBUG) {
+                Log.d(TAG, "Sending Result back to Resolver: " + targets);
+            }
+            synchronized (mLock) {
+                final Message msg = Message.obtain();
+                msg.what = RANKER_SERVICE_RESULT;
+                msg.obj = targets;
+                Handler handler = mHandlerRef.get();
+                if (handler != null) {
+                    handler.sendMessage(msg);
+                }
+            }
+        }
+    }
+
     @Override
     void beforeCompute() {
         super.beforeCompute();
diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java
index 8387212a..bf651bbf 100644
--- a/java/src/com/android/intentresolver/v2/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java
@@ -493,6 +493,12 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     @Override
     protected final void onDestroy() {
         super.onDestroy();
+        if (!isChangingConfigurations() && mPickOptionRequest != null) {
+            mPickOptionRequest.cancel();
+        }
+        if (mChooserMultiProfilePagerAdapter != null) {
+            mChooserMultiProfilePagerAdapter.destroy();
+        }
 
         if (isFinishing()) {
             mLatencyTracker.onActionCancel(ACTION_LOAD_SHARE_SHEET);
diff --git a/java/src/com/android/intentresolver/v2/profiles/ChooserMultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/v2/profiles/ChooserMultiProfilePagerAdapter.java
index 0ee9d141..c078c43f 100644
--- a/java/src/com/android/intentresolver/v2/profiles/ChooserMultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/v2/profiles/ChooserMultiProfilePagerAdapter.java
@@ -151,6 +151,16 @@ public class ChooserMultiProfilePagerAdapter extends MultiProfilePagerAdapter<
         }
     }
 
+    /** Cleanup system resources */
+    public void destroy() {
+        for (int i = 0, count = getItemCount(); i < count; i++) {
+            ChooserGridAdapter adapter = getPageAdapterForIndex(i);
+            if (adapter != null) {
+                adapter.getListAdapter().onDestroy();
+            }
+        }
+    }
+
     private static class BottomPaddingOverrideSupplier implements Supplier<Optional<Integer>> {
         private final Context mContext;
         private int mBottomOffset;