Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Rename temp file to use a valid image file extension" into rvc-qpr-dev

Browse Source
This commit is contained in:
Sungsoo Lim
2020-09-02 06:09:14 +00:00
committed by Android (Google) Code Review
parent 98b5abf507 bb6d38615e
commit fe652ee800
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/ExifInterface.java
View File

@@ -68,6 +68,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.CRC32;
@@ -2079,7 +2080,10 @@ public class ExifInterface {
try {
// Move the original file to temporary file.
if (mFilename != null) {
tempFile = new File(mFilename + ".tmp");
String parent = originalFile.getParent();
String name = originalFile.getName();
String tempPrefix = UUID.randomUUID().toString() + "_";
tempFile = new File(parent, tempPrefix + name);
if (!originalFile.renameTo(tempFile)) {
throw new IOException("Couldn't rename to " + tempFile.getAbsolutePath());
}