summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-06-04 13:50:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-04 13:50:31 -0700
commit1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac (patch)
treee7880c77fa7537b6ef1a6d72b0a0fe9d259d9a77 /services
parent2d743fe2f39397d41334001d897eb78da56e94ef (diff)
parent4b3309211ed6f3532b44481945a4725143d50b8a (diff)
downloadframeworks_base-1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac.zip
frameworks_base-1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac.tar.gz
frameworks_base-1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac.tar.bz2
am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp * commit '4b3309211ed6f3532b44481945a4725143d50b8a': Don't crash when low storage is encountered pre-boot completion.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/DeviceStorageMonitorService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/DeviceStorageMonitorService.java b/services/java/com/android/server/DeviceStorageMonitorService.java
index 62cf707..4a0df59 100644
--- a/services/java/com/android/server/DeviceStorageMonitorService.java
+++ b/services/java/com/android/server/DeviceStorageMonitorService.java
@@ -280,7 +280,9 @@ class DeviceStorageMonitorService extends Binder {
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);
}