Merge "Keyguard sound needs to hold wake lock."

2011-09-21 15:15:18 -07:00
parent d30f73725b e47e8520fa
commit dda868cd33
2 changed files with 17 additions and 1 deletions
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -203,7 +203,22 @@ public class Ringtone {
        mUri = uri;
        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.
     */