drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keyguard sound needs to hold wake lock."

Browse Source
This commit is contained in:
Dianne Hackborn
2011-09-21 15:15:18 -07:00
committed by Android (Google) Code Review
parent d30f73725b e47e8520fa
commit dda868cd33
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/java/android/media/Ringtone.java
View File

@ -204,6 +204,21 @@ public class Ringtone {
openMediaPlayer(); 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. * Plays the ringtone.
*/ */

1
policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@ -1054,6 +1054,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri); final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);
if (sfx != null) { if (sfx != null) {
sfx.setStreamType(AudioManager.STREAM_SYSTEM); sfx.setStreamType(AudioManager.STREAM_SYSTEM);
sfx.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
sfx.play(); sfx.play();
} else { } else {
if (DEBUG) Log.d(TAG, "playSounds: failed to load ringtone from uri: " if (DEBUG) Log.d(TAG, "playSounds: failed to load ringtone from uri: "