commit 66236db38dbaae229a86005309b9f7c74eabc998
author Jeff Hamilton <jham@android.com> Fri Jun 04 13:52:45 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 04 13:52:45 2010 -0700
tree 96bcf8854c357992fecbb9829f431b07aa2fb933
parent fef42db92568918161a2a9d69411290adfa1720f
parent 1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac

am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.

Merge commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken

* commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
  Don't crash when low storage is encountered pre-boot completion.

services/java/com/android/server/DeviceStorageMonitorService.java

diff --git a/services/java/com/android/server/DeviceStorageMonitorService.java b/services/java/com/android/server/DeviceStorageMonitorService.java
index 62cf7076..4a0df59 100644
--- a/services/java/com/android/server/DeviceStorageMonitorService.java
+++ b/services/java/com/android/server/DeviceStorageMonitorService.java
@@ -280,7 +280,9 @@
         mTotalMemory = ((long)mDataFileStats.getBlockCount() *
                         mDataFileStats.getBlockSize())/100L;
         mStorageLowIntent = new Intent(Intent.ACTION_DEVICE_STORAGE_LOW);
+        mStorageLowIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
         mStorageOkIntent = new Intent(Intent.ACTION_DEVICE_STORAGE_OK);
+        mStorageOkIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
         checkMemory(true);
     }