Don't try caching null ringtones.

Bug: 27330629
Change-Id: Id09d10d6f4a3a20782480647c68a5c94ef69e7b3

1 files changed, 9 insertions, 7 deletions

diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 06ac11b41c1a..feb490de2c3e 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -663,13 +663,15 @@ public class RingtoneManager {
 
         // Stream selected ringtone into cache so it's available for playback
         // when CE storage is still locked
-        final ContentResolver cr = context.getContentResolver();
-        final Uri cacheUri = getCacheForType(type);
-        try (InputStream in = cr.openInputStream(ringtoneUri);
-                OutputStream out = cr.openOutputStream(cacheUri)) {
-            Streams.copy(in, out);
-        } catch (IOException e) {
-            Log.w(TAG, "Failed to cache ringtone: " + e);
+        if (ringtoneUri != null) {
+            final ContentResolver cr = context.getContentResolver();
+            final Uri cacheUri = getCacheForType(type);
+            try (InputStream in = cr.openInputStream(ringtoneUri);
+                    OutputStream out = cr.openOutputStream(cacheUri)) {
+                Streams.copy(in, out);
+            } catch (IOException e) {
+                Log.w(TAG, "Failed to cache ringtone: " + e);
+            }
         }
     }