commit 5ba7f27491e287f39a999ddd3d1ed6a7bad78272
author Santos Cordon <santoscordon@google.com> Wed May 28 13:59:49 2014 -0700
committer Santos Cordon <santoscordon@google.com> Fri May 30 07:24:14 2014 +0000
tree 6983c1afc27c066661caf6796d41edd4c07f5196
parent f2e8e6abdc618f6557f1bbc3fa2e14f536e4fc2f

Add custom ringtone support.

Bug: 15313520

Change-Id: Ib4a553139b5b9d7852bdeb57ad5e33dfa35f9be8

src/com/android/telecomm/AsyncRingtonePlayer.java

diff --git a/src/com/android/telecomm/AsyncRingtonePlayer.java b/src/com/android/telecomm/AsyncRingtonePlayer.java
index 1c5cafe..7bec55f 100644
--- a/src/com/android/telecomm/AsyncRingtonePlayer.java
+++ b/src/com/android/telecomm/AsyncRingtonePlayer.java
@@ -19,6 +19,7 @@
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
@@ -42,15 +43,15 @@
     private Ringtone mRingtone;
 
     /** Plays the ringtone. */
-    void play() {
+    void play(Uri ringtone) {
         Log.d(this, "Posting play.");
-        postMessage(EVENT_PLAY, true /* shouldCreateHandler */);
+        postMessage(EVENT_PLAY, true /* shouldCreateHandler */, ringtone);
     }
 
     /** Stops playing the ringtone. */
     void stop() {
         Log.d(this, "Posting stop.");
-        postMessage(EVENT_STOP, false /* shouldCreateHandler */);
+        postMessage(EVENT_STOP, false /* shouldCreateHandler */, null);
     }
 
     /**
@@ -60,7 +61,7 @@
      * @param messageCode The message to post.
      * @param shouldCreateHandler True when a handler should be created to handle this message.
      */
-    private void postMessage(int messageCode, boolean shouldCreateHandler) {
+    private void postMessage(int messageCode, boolean shouldCreateHandler, Uri ringtone) {
         synchronized(this) {
             if (mHandler == null && shouldCreateHandler) {
                 mHandler = getNewHandler();
@@ -69,7 +70,7 @@
             if (mHandler == null) {
                 Log.d(this, "Message %d skipped because there is no handler.", messageCode);
             } else {
-                mHandler.sendEmptyMessage(messageCode);
+                mHandler.obtainMessage(messageCode, ringtone).sendToTarget();
             }
         }
     }
@@ -88,7 +89,7 @@
             public void handleMessage(Message msg) {
                 switch(msg.what) {
                     case EVENT_PLAY:
-                        handlePlay();
+                        handlePlay((Uri) msg.obj);
                         break;
                     case EVENT_STOP:
                         handleStop();
@@ -101,12 +102,12 @@
     /**
      * Starts the actual playback of the ringtone. Executes on ringtone-thread.
      */
-    private void handlePlay() {
+    private void handlePlay(Uri ringtoneUri) {
         ThreadUtil.checkNotOnMainThread();
         Log.i(this, "Play ringtone.");
 
         if (mRingtone == null) {
-            mRingtone = getCurrentRingtone();
+            mRingtone = getRingtone(ringtoneUri);
 
             // Cancel everything if there is no ringtone.
             if (mRingtone == null) {
@@ -148,10 +149,12 @@
         }
     }
 
-    private Ringtone getCurrentRingtone() {
-        // TODO: Needs support for custom ringtones.
-        Ringtone ringtone = RingtoneManager.getRingtone(
-                TelecommApp.getInstance(), Settings.System.DEFAULT_RINGTONE_URI);
+    private Ringtone getRingtone(Uri ringtoneUri) {
+        if (ringtoneUri == null) {
+            ringtoneUri = Settings.System.DEFAULT_RINGTONE_URI;
+        }
+
+        Ringtone ringtone = RingtoneManager.getRingtone(TelecommApp.getInstance(), ringtoneUri);
         ringtone.setStreamType(AudioManager.STREAM_RING);
         return ringtone;
     }