commit ac4381d357a90201d58c67743983bf361e2fe023
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 24 19:19:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 19:19:30 2018 +0000
tree 88413724e2fab35d0da3301f724367ddddf5d10a
parent 2e92e5c30bc3c0e037bdf975bb85d1d7855d0084
parent 368eba1c140f734f2d74db2f9314350c57aeab4e

Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am: 004e01d388" into pi-dev-plus-aosp

media/java/android/media/RingtoneManager.java

diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index fefa1ed..0dddaf5 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -952,7 +952,8 @@
 
         // Find a filename. Throws FileNotFoundException if none can be found.
         final File outFile = Utils.getUniqueExternalFile(mContext, subdirectory,
-                Utils.getFileDisplayNameFromUri(mContext, fileUri), mimeType);
+                FileUtils.buildValidFatFilename(Utils.getFileDisplayNameFromUri(mContext, fileUri)),
+                        mimeType);
 
         // Copy contents to external ringtone storage. Throws IOException if the copy fails.
         try (final InputStream input = mContext.getContentResolver().openInputStream(fileUri);