diff options
Diffstat (limited to 'tests/tests/media/audio/src/android/media/audio/cts/RingtoneTest.java')
| -rw-r--r-- | tests/tests/media/audio/src/android/media/audio/cts/RingtoneTest.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/RingtoneTest.java b/tests/tests/media/audio/src/android/media/audio/cts/RingtoneTest.java index 38f7a37c6e3..c24500e2d88 100644 --- a/tests/tests/media/audio/src/android/media/audio/cts/RingtoneTest.java +++ b/tests/tests/media/audio/src/android/media/audio/cts/RingtoneTest.java @@ -16,6 +16,7 @@ package android.media.audio.cts; +import android.content.ContentProvider; import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioAttributes; @@ -171,11 +172,13 @@ public class RingtoneTest extends InstrumentationTestCase { // Test an actual ringtone Uri uri = RingtoneManager.getValidRingtoneUri(mContext); assertNotNull("ringtone was unexpectedly null", uri); - RingtoneManager.setActualDefaultRingtoneUri(mContext, RingtoneManager.TYPE_RINGTONE, uri); + Uri uriWithUser = ContentProvider.maybeAddUserId(uri, mContext.getUserId()); + RingtoneManager.setActualDefaultRingtoneUri(mContext, RingtoneManager.TYPE_RINGTONE, + uriWithUser); mRingtone = RingtoneManager.getRingtone(mContext, Settings.System.DEFAULT_RINGTONE_URI); assertTrue(mRingtone.getStreamType() == AudioManager.STREAM_RING); mRingtone.play(); - assertTrue("couldn't play ringtone " + uri, mRingtone.isPlaying()); + assertTrue("couldn't play ringtone " + uriWithUser, mRingtone.isPlaying()); mRingtone.stop(); assertFalse(mRingtone.isPlaying()); } |