commit 29955b5cfc2ef2fdde6fde4d141be61cd65d5ed3
author Mehdi Alizadeh <mett@google.com> Thu May 02 12:59:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 02 12:59:18 2019 -0700
tree 674a7e08552eb372d475afbbdd02b81debea0c29
parent 7fc8f1f82d28b46c7d381e31a87af2f5be8a468b
parent 545021d0c9ddf3f80118042e8c349be7b9e28635

Merge "Cleanup messages in onDestory in ChooserActivity" into qt-dev
am: 545021d0c9

Change-Id: If1aa39fc0734a298defaed92d5eb3ff1dbc9ea4b

core/java/com/android/internal/app/ChooserActivity.java

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 1eabbd8..bbce291 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -919,6 +919,8 @@
         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();