bug:3338089 NPE in downloadthread

Change-Id: I95b4c52598092e9f6ffa1713b36ac11d44e26279

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 8b8d8bd1..61fb209f 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -416,7 +416,8 @@ public class DownloadThread extends Thread {
                 if (state.mStream == null) {
                     state.mStream = new FileOutputStream(state.mFilename, true);
                 }
-                mStorageManager.verifySpaceBeforeWritingToFile(mInfo.mDestination, null, bytesRead);
+                mStorageManager.verifySpaceBeforeWritingToFile(mInfo.mDestination, state.mFilename,
+                        bytesRead);
                 state.mStream.write(data, 0, bytesRead);
                 if (mInfo.mDestination == Downloads.Impl.DESTINATION_EXTERNAL
                             && !isDrmFile(state)) {
@@ -424,7 +425,12 @@ public class DownloadThread extends Thread {
                 }
                 return;
             } catch (IOException ex) {
-                mStorageManager.verifySpace(mInfo.mDestination, null, bytesRead);
+                // couldn't write to file. are we out of space? check.
+                // TODO this check should only be done once. why is this being done 
+                // in a while(true) loop (see the enclosing statement: for(;;)
+                if (state.mStream != null) {
+                    mStorageManager.verifySpace(mInfo.mDestination, state.mFilename, bytesRead);
+                }
             }
         }
     }