diff options
| author | Steve Howard <showard@google.com> | 2010-07-27 17:23:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-27 17:23:21 -0700 |
| commit | 7a8bf08fe936a1fdb0408dea1ec2f39b83acc5d7 (patch) | |
| tree | 07e0ca34ce7242f985bdc0d13506d2d3bdecbbe2 /src | |
| parent | b6ba05828ace9546e5e27d3745e7cbcba323b66d (diff) | |
| parent | f6b4c24b4a876daa3f4e91d6da418983222b9dfd (diff) | |
| download | android_packages_providers_DownloadProvider-7a8bf08fe936a1fdb0408dea1ec2f39b83acc5d7.tar.gz android_packages_providers_DownloadProvider-7a8bf08fe936a1fdb0408dea1ec2f39b83acc5d7.tar.bz2 android_packages_providers_DownloadProvider-7a8bf08fe936a1fdb0408dea1ec2f39b83acc5d7.zip | |
am f6b4c24b: Fix bug with closing output stream for external downloads.
Merge commit 'f6b4c24b4a876daa3f4e91d6da418983222b9dfd' into gingerbread-plus-aosp
* commit 'f6b4c24b4a876daa3f4e91d6da418983222b9dfd':
Fix bug with closing output stream for external downloads.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 1 | ||||
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index 431a19ee..d79e026d 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -325,6 +325,7 @@ public class DownloadThread extends Thread { // close the file if (state.mStream != null) { state.mStream.close(); + state.mStream = null; } } catch (IOException ex) { if (Constants.LOGV) { diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index 58ab578a..f2988954 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -513,10 +513,9 @@ public class Helpers { * Checks whether the filename looks legitimate */ public static boolean isFilenameValid(String filename) { - File dir = new File(filename).getParentFile(); - return dir.equals(Environment.getDownloadCacheDirectory()) - || dir.equals(new File(Environment.getExternalStorageDirectory() - + Constants.DEFAULT_DL_SUBDIR)); + filename = filename.replaceFirst("/+", "/"); // normalize leading slashes + return filename.startsWith(Environment.getDownloadCacheDirectory().toString()) + || filename.startsWith(Environment.getExternalStorageDirectory().toString()); } /** |