android.media.Ringtone: add getter for AudioAttributes

Bug 17290606

Change-Id: I28406080cc1fb6a916b2859d0ef39980464953e9

2 files changed, 10 insertions, 0 deletions

diff --git a/api/current.txt b/api/current.txt
index 6723108..91a6170 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15706,6 +15706,7 @@ package android.media {
   }
 
   public class Ringtone {
+    method public android.media.AudioAttributes getAudioAttributes();
     method public deprecated int getStreamType();
     method public java.lang.String getTitle(android.content.Context);
     method public boolean isPlaying();
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index a221104..7d075ba 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -115,6 +115,15 @@ public class Ringtone {
     }
 
     /**
+     * Returns the {@link AudioAttributes} used by this object.
+     * @return the {@link AudioAttributes} that were set with
+     *     {@link #setAudioAttributes(AudioAttributes)} or the default attributes if none were set.
+     */
+    public AudioAttributes getAudioAttributes() {
+        return mAudioAttributes;
+    }
+
+    /**
      * Returns a human-presentable title for ringtone. Looks in media
      * content provider. If not in either, uses the filename
      *