Merge "Fix the logic to add suffix when copying." into nyc-dev

2016-03-22 01:34:58 +00:00
parent ef8ee4c7bb 4f04fd358d
commit 07db6f3969
1 changed files with 6 additions and 2 deletions
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
@@ -360,8 +360,12 @@ public class MtpDocumentsProvider extends DocumentsProvider {
                    if (i == 0) {
                        infoUniqueName = info;
                    } else {
-                        infoUniqueName = new MtpObjectInfo.Builder(info).setName(
-                                baseName + " (" + i + ")." + extension).build();
+                        String suffixedName = baseName + " (" + i + " )";
+                        if (!extension.isEmpty()) {
+                            suffixedName += "." + extension;
+                        }
+                        infoUniqueName =
+                                new MtpObjectInfo.Builder(info).setName(suffixedName).build();
                    }
                    try {
                        objectHandle = mMtpManager.createDocument(