commit 7c6c3f8b974be724150455414684d0e953215044
author Daisuke Teranishi <daisuke.x.teranishi@sony.com> Thu May 24 17:03:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 24 17:03:53 2018 -0700
tree b179bed1524d8d7cde48663419b1cf18dd1f4665
parent ea4442a3406b23a3e615300c574ce942ee90e06b
parent 2e92e5c30bc3c0e037bdf975bb85d1d7855d0084

Merge "Use correct filename when adding to ringtone" am: daff857ffd am: 24062f05d3
am: 2e92e5c30b

Change-Id: I36e7f3d6787deb0c1efdcdaf55d209f55dcdc625

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