commit 2e92e5c30bc3c0e037bdf975bb85d1d7855d0084
author Daisuke Teranishi <daisuke.x.teranishi@sony.com> Thu May 24 12:18:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 24 12:18:14 2018 -0700
tree 683f1d87e7dca6827b9883abde087f47257e494e
parent 92b686dd6964325de21660b45e56fc57860fe4bd
parent 24062f05d3936218eb03b46975832d06b4af1be5

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

Change-Id: Id9d89491c5604b1611b22f215827f55de98f8ac2

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