Merge "Fix the logic to add suffix when copying." into nyc-dev (07db6f39) · Commits · e / os / android_frameworks_base

packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -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(