summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers
diff options
context:
space:
mode:
authorHyejin Kim <hyejin.kim@lge.com>2014-09-05 15:52:33 +0900
committerJohn Spurlock <jspurlock@google.com>2014-09-11 12:05:54 -0400
commit5ecb5a82857217edc17181210a980a705a12f02d (patch)
tree4ba9f5418215f90d18079e8762d9bdc93a9ad75a /src/com/android/providers
parenta9aa6ae4433635edbb4a1dd4304bcaac04bc7c7b (diff)
downloadandroid_packages_providers_MediaProvider-5ecb5a82857217edc17181210a980a705a12f02d.tar.gz
android_packages_providers_MediaProvider-5ecb5a82857217edc17181210a980a705a12f02d.tar.bz2
android_packages_providers_MediaProvider-5ecb5a82857217edc17181210a980a705a12f02d.zip
Revert "RingtonePicker: use a non-intercepted stream for playback."
This reverts commit c50b2befee37f28f9b482b0a31a62329142e4a6a. When user set alarm ringtone in DeskClock, It can't play with AudioManager.STREAM_SYSTEM stream type Bug: 16906307 Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
Diffstat (limited to 'src/com/android/providers')
-rw-r--r--src/com/android/providers/media/RingtonePickerActivity.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java
index d96208b3..82fe0c0f 100644
--- a/src/com/android/providers/media/RingtonePickerActivity.java
+++ b/src/com/android/providers/media/RingtonePickerActivity.java
@@ -19,7 +19,6 @@ 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;
@@ -327,8 +326,6 @@ public final class RingtonePickerActivity extends AlertActivity implements
}
if (ringtone != null) {
- // use a non-intercepted stream for playback
- ringtone.setStreamType(AudioManager.STREAM_SYSTEM);
ringtone.play();
}
}