diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-20 13:29:53 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-07-20 13:32:55 -0400 |
| commit | c50b2befee37f28f9b482b0a31a62329142e4a6a (patch) | |
| tree | 73b102ae3b38e2c579b2d316753f0b81f6e42176 /src | |
| parent | 88f3eb4afeecc020f633d7e10816650ccddeb65f (diff) | |
| download | android_packages_providers_MediaProvider-c50b2befee37f28f9b482b0a31a62329142e4a6a.tar.gz android_packages_providers_MediaProvider-c50b2befee37f28f9b482b0a31a62329142e4a6a.tar.bz2 android_packages_providers_MediaProvider-c50b2befee37f28f9b482b0a31a62329142e4a6a.zip | |
RingtonePicker: use a non-intercepted stream for playback.
When choosing a ringtone, avoid the ringer stream during
playback to avoid interception.
As before, no playback is performed if muted.
Bug:15344396
Change-Id: I7301c7e60682c57187708dfc8fa933a150c5147a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/media/RingtonePickerActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java index 3075bbb6..e7c0b124 100644 --- a/src/com/android/providers/media/RingtonePickerActivity.java +++ b/src/com/android/providers/media/RingtonePickerActivity.java @@ -19,6 +19,7 @@ package com.android.providers.media; import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; +import android.media.AudioManager; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; @@ -326,6 +327,8 @@ public final class RingtonePickerActivity extends AlertActivity implements } if (ringtone != null) { + // use a non-intercepted stream for playback + ringtone.setStreamType(AudioManager.STREAM_SYSTEM); ringtone.play(); } } |