Merge "RingtonePickerActivity: Keep cursor open while visible." into nyc-dev

0218e5f1 · Rob Carr · Android (Google) Code Review · e23e66b5 · 4f8fbf74 · 0218e5f1
Commit 0218e5f1 authored 9 years ago by Rob Carr Committed by Android (Google) Code Review 9 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

src/com/android/providers/media/RingtonePickerActivity.java src/com/android/providers/media/RingtonePickerActivity.java +2 -6

No files found.
--- a/src/com/android/providers/media/RingtonePickerActivity.java
+++ b/src/com/android/providers/media/RingtonePickerActivity.java
@@ -282,12 +282,6 @@ public final class RingtonePickerActivity extends AlertActivity implements
            setResult(RESULT_CANCELED);
        }

-        getWindow().getDecorView().post(new Runnable() {
-            public void run() {
-                mCursor.deactivate();
-            }
-        });
-
        finish();
    }

@@ -346,6 +340,8 @@ public final class RingtonePickerActivity extends AlertActivity implements
    @Override
    protected void onStop() {
        super.onStop();
+        mCursor.deactivate();
+
        if (!isChangingConfigurations()) {
            stopAnyPlayingRingtone();
        } else {