diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-26 13:38:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 13:38:22 -0700 |
| commit | 1951db86f527ff4e8c2ddf4306779ce956cd372d (patch) | |
| tree | ec949cff9b00baf7d1a80909a80984bbdc933e9f /media/java | |
| parent | fd3398c8bf25d8ec7ce813ebda431d67d734f268 (diff) | |
| parent | 65c4a2b26cd8776b0927e9b0e07ecf53bd31b627 (diff) | |
| download | frameworks_base-1951db86f527ff4e8c2ddf4306779ce956cd372d.zip frameworks_base-1951db86f527ff4e8c2ddf4306779ce956cd372d.tar.gz frameworks_base-1951db86f527ff4e8c2ddf4306779ce956cd372d.tar.bz2 | |
Merge "Multi-user ringtone playback." into jb-mr1-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/IRingtonePlayer.aidl | 3 | ||||
| -rw-r--r-- | media/java/android/media/Ringtone.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/IRingtonePlayer.aidl b/media/java/android/media/IRingtonePlayer.aidl index 44a0333..0872f1d 100644 --- a/media/java/android/media/IRingtonePlayer.aidl +++ b/media/java/android/media/IRingtonePlayer.aidl @@ -17,6 +17,7 @@ package android.media; import android.net.Uri; +import android.os.UserHandle; /** * @hide @@ -28,6 +29,6 @@ interface IRingtonePlayer { boolean isPlaying(IBinder token); /** Used for Notification sound playback. */ - void playAsync(in Uri uri, boolean looping, int streamType); + void playAsync(in Uri uri, in UserHandle user, boolean looping, int streamType); void stopAsync(); } diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index 23f7b55..f190eb9 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -225,8 +225,9 @@ public class Ringtone { mLocalPlayer.start(); } } else if (mAllowRemote) { + final Uri canonicalUri = mUri.getCanonicalUri(); try { - mRemotePlayer.play(mRemoteToken, mUri, mStreamType); + mRemotePlayer.play(mRemoteToken, canonicalUri, mStreamType); } catch (RemoteException e) { Log.w(TAG, "Problem playing ringtone: " + e); } |