Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-08 08:17:48 +00:00
committed by Android (Google) Code Review
parent c60f54edfb d42fe85bc9
commit dd7ff22325
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
View File

@@ -87,6 +87,11 @@ public class DeviceStorageMonitorService extends SystemService {
private static final long DEFAULT_DISK_FREE_CHANGE_REPORTING_THRESHOLD = 2 * 1024 * 1024; // 2MB private static final long DEFAULT_DISK_FREE_CHANGE_REPORTING_THRESHOLD = 2 * 1024 * 1024; // 2MB
private static final long DEFAULT_CHECK_INTERVAL = MONITOR_INTERVAL*60*1000; private static final long DEFAULT_CHECK_INTERVAL = MONITOR_INTERVAL*60*1000;
// com.android.internal.R.string.low_internal_storage_view_text_no_boot
// hard codes 250MB in the message as the storage space required for the
// boot image.
private static final long BOOT_IMAGE_STORAGE_REQUIREMENT = 250 * 1024 * 1024;
private long mFreeMem; // on /data private long mFreeMem; // on /data
private long mFreeMemAfterLastCacheClear; // on /data private long mFreeMemAfterLastCacheClear; // on /data
private long mLastReportedFreeMem; private long mLastReportedFreeMem;
@@ -290,9 +295,10 @@ public class DeviceStorageMonitorService extends SystemService {
mLowMemFlag = false; mLowMemFlag = false;
} }
} }
if (!mLowMemFlag && !mIsBootImageOnDisk) { if (!mLowMemFlag && !mIsBootImageOnDisk && mFreeMem < BOOT_IMAGE_STORAGE_REQUIREMENT) {
Slog.i(TAG, "No boot image on disk due to lack of space. Sending notification"); Slog.i(TAG, "No boot image on disk due to lack of space. Sending notification");
sendNotification(); sendNotification();
mLowMemFlag = true;
} }
if (mFreeMem < mMemFullThreshold) { if (mFreeMem < mMemFullThreshold) {
if (!mMemFullFlag) { if (!mMemFullFlag) {
@@ -383,7 +389,7 @@ public class DeviceStorageMonitorService extends SystemService {
@Override @Override
public boolean isMemoryLow() { public boolean isMemoryLow() {
return mLowMemFlag || !mIsBootImageOnDisk; return mLowMemFlag;
} }
@Override @Override