Merge "Remove Ringtone.setWakeMode, it's not needed."
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 @@
         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.
      */