From c8eee94e1b830f9ad2460cd48cb70dfb2a84c58c Mon Sep 17 00:00:00 2001
From: Matthew Mintz <mminty@google.com>
Date: Tue, 21 Jul 2020 15:42:14 +0800
Subject: Remove callbacks and messages in onDestroy().

The Runnable is running after destroying the Cursor, which only happens in onDestroy(). So clean up before that happens.

Bug: 151283186
Test: Built, installed, and set ringtone.
Change-Id: I95c824675e6e710a1dc5d1f8faef2daff6f563e6
Merged-In: I95c824675e6e710a1dc5d1f8faef2daff6f563e6
(cherry picked from commit 2e23b5c0139e78240c2eede61b19731acd7f8c71)
---
 .../src/com/android/soundpicker/RingtonePickerActivity.java            | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'packages/SoundPicker/src')

diff --git a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java
index d2f168eb5e3e..d69f3d620d48 100644
--- a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java
+++ b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java
@@ -333,6 +333,9 @@ public final class RingtonePickerActivity extends AlertActivity implements
 
     @Override
     public void onDestroy() {
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+        }
         if (mCursor != null) {
             mCursor.close();
             mCursor = null;
-- 
cgit v1.2.3