Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't try caching null ringtones." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-02-24 16:55:36 +00:00
committed by Android (Google) Code Review
parent dbdca5b299 97f061bb7c
commit 6bda33f6a0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/java/android/media/RingtoneManager.java
View File

@@ -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);
}
}
}