Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bdaf8fc authored by Ian Baker's avatar Ian Baker Committed by Automerger Merge Worker
Browse files

Merge "RingtoneManager#setActualDefaultRingtone() open OutputStream of... 

Merge "RingtoneManager#setActualDefaultRingtone() open OutputStream of cacheUri with "wt" mode" am: f922e9fa am: a44c29cd am: 5854401f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2447583



Change-Id: Ibb12a8e9b7fe2cf675ef24d0a24d02ac63d1f931
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1000d86 5854401f

media/java/android/media/RingtoneManager.java

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ public class RingtoneManager { 
        if (ringtoneUri != null) {

            final Uri cacheUri = getCacheForType(type, context.getUserId());

            try (InputStream in = openRingtone(context, ringtoneUri);

                    OutputStream out = resolver.openOutputStream(cacheUri)) {

                    OutputStream out = resolver.openOutputStream(cacheUri, "wt")) {

                FileUtils.copy(in, out);

            } catch (IOException e) {

                Log.w(TAG, "Failed to cache ringtone: " + e);