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

Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev am: ecd73f48fe

Browse Source 
am: 289da55c68

* commit '289da55c6869993de861842867ae8e51107c8561':
  Frameworks/base: Use holder in FileUtils

Change-Id: I8fbad4d3a391846adac223666c5da6bcbb8efb3d
This commit is contained in:
Andreas Gampe
2016-04-29 07:18:18 +00:00
committed by android-build-merger
parent 54c24c6fb5 289da55c68
commit a4661cbbd1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/os/FileUtils.java
View File

@@ -72,8 +72,13 @@ public class FileUtils {
public static final int S_IWOTH = 00002;
public static final int S_IXOTH = 00001;
/** Regular expression for safe filenames: no spaces or metacharacters */
private static final Pattern SAFE_FILENAME_PATTERN = Pattern.compile("[\\w%+,./=_-]+");
/** Regular expression for safe filenames: no spaces or metacharacters.
*
* Use a preload holder so that FileUtils can be compile-time initialized.
*/
private static class NoImagePreloadHolder {
public static final Pattern SAFE_FILENAME_PATTERN = Pattern.compile("[\\w%+,./=_-]+");
}
private static final File[] EMPTY = new File[0];
@@ -243,7 +248,7 @@ public class FileUtils {
// Note, we check whether it matches what's known to be safe,
// rather than what's known to be unsafe. Non-ASCII, control
// characters, etc. are all unsafe by default.
return SAFE_FILENAME_PATTERN.matcher(file.getPath()).matches();
return NoImagePreloadHolder.SAFE_FILENAME_PATTERN.matcher(file.getPath()).matches();
}
/**