summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2011-09-30 11:13:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-30 11:13:39 -0700
commitce0a7ade96ddbdcb342e0b382e9d3ea43962cafd (patch)
treee87c56aae986de91e91e7fadaeef4f4745fc3cbe /media
parentcb52d012e910b86d3562d4cad32d66e17986e286 (diff)
parentb741c604861ddbafcacaa452e31bd19337a19705 (diff)
downloadframeworks_base-ce0a7ade96ddbdcb342e0b382e9d3ea43962cafd.zip
frameworks_base-ce0a7ade96ddbdcb342e0b382e9d3ea43962cafd.tar.gz
frameworks_base-ce0a7ade96ddbdcb342e0b382e9d3ea43962cafd.tar.bz2
Merge "Remove Ringtone.setWakeMode, it's not needed."
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/Ringtone.java15
1 files changed, 0 insertions, 15 deletions
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index 8bb5233..f16ba36 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -207,21 +207,6 @@ public class Ringtone {
openMediaPlayer();
}
- /** @hide */
- public void setWakeMode(Context context, int mode) {
- if (mAudio == null) {
- try {
- openMediaPlayer();
- } catch (Exception ex) {
- Log.e(TAG, "setWakeMode() caught ", ex);
- mAudio = null;
- }
- }
- if (mAudio != null) {
- mAudio.setWakeMode(context, mode);
- }
- }
-
/**
* Plays the ringtone.
*/