summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Mintz <mminty@google.com>2020-07-21 15:42:14 +0800
committerMatthew Mintz <mminty@google.com>2020-07-22 06:44:31 +0000
commitc8eee94e1b830f9ad2460cd48cb70dfb2a84c58c (patch)
tree9f4a9779939387b9cca3746857a022319b7688d3
parent269b829684bb93774c59bd708e2d285f27ebaf87 (diff)
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)
-rw-r--r--packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java3
1 files changed, 3 insertions, 0 deletions
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;