summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-01-17 19:23:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-17 19:23:13 +0000
commit34d915e1dccf3d65e5a7c7f3a2273047ba8e51e8 (patch)
treef3131043f03af7ca6f1e54950f6f9f4e234ebc52
parent762140410bebac113e04ff5c7038a834f9f28363 (diff)
parent18794718f15cbf79c8da732af3e8368c7b905523 (diff)
downloadandroid_packages_providers_DownloadProvider-34d915e1dccf3d65e5a7c7f3a2273047ba8e51e8.tar.gz
android_packages_providers_DownloadProvider-34d915e1dccf3d65e5a7c7f3a2273047ba8e51e8.tar.bz2
android_packages_providers_DownloadProvider-34d915e1dccf3d65e5a7c7f3a2273047ba8e51e8.zip
am 18794718: am c5d43a1f: Merge "Creates parent directories before creates file"
* commit '18794718f15cbf79c8da732af3e8368c7b905523': Creates parent directories before creates file
-rw-r--r--src/com/android/providers/downloads/Helpers.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index 013faf27..3562dac7 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -141,7 +141,15 @@ public class Helpers {
// Claim this filename inside lock to prevent other threads from
// clobbering us. We're not paranoid enough to use O_EXCL.
try {
- new File(path).createNewFile();
+ File file = new File(path);
+ File parent = file.getParentFile();
+
+ // Make sure the parent directories exists before generates new file
+ if (parent != null && !parent.exists()) {
+ parent.mkdirs();
+ }
+
+ file.createNewFile();
} catch (IOException e) {
throw new StopRequestException(Downloads.Impl.STATUS_FILE_ERROR,
"Failed to create target file " + path, e);