From f472313347451ef2c3d1faed003e2146bbbcb970 Mon Sep 17 00:00:00 2001
From: Mehdi Alizadeh <mett@google.com>
Date: Thu, 25 Apr 2019 17:16:30 -0700
Subject: Cleanup messages in onDestory in ChooserActivity

Bug: 129679731
Test: Builds and ShareSheet works
Change-Id: I78afd4546e139698213e952495d46fc401fba540
---
 core/java/com/android/internal/app/ChooserActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 1eabbd8bd00e..bbce291c6975 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -919,6 +919,8 @@ public class ChooserActivity extends ResolverActivity {
         mChooserHandler.removeMessages(LIST_VIEW_UPDATE_MESSAGE);
         mChooserHandler.removeMessages(CHOOSER_TARGET_SERVICE_WATCHDOG_TIMEOUT);
         mChooserHandler.removeMessages(CHOOSER_TARGET_SERVICE_RESULT);
+        mChooserHandler.removeMessages(SHORTCUT_MANAGER_SHARE_TARGET_RESULT);
+        mChooserHandler.removeMessages(SHORTCUT_MANAGER_SHARE_TARGET_RESULT_COMPLETED);
         if (mAppPredictor != null) {
             mAppPredictor.unregisterPredictionUpdates(mAppPredictorCallback);
             mAppPredictor.destroy();
-- 
cgit v1.2.3-59-g8ed1b