Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 711f8dbd authored by Josh Stone's avatar Josh Stone Committed by Pawit Pornkitprasan
Browse files

Monitor device storage directly in /data/data 

The DeviceStorageMonitorService watches over /data, and when things get
full, starts deleting app cached files.  The app caches are actually
under /data/data, which on DINC is its own mount.  This means the
monitor did not notice when app cache grew too big, as it only saw the
size of /data proper.

This patch makes the monitor look at /data/data instead.  For DINC, this
means it can properly manage app cache, but it won't notice if the upper
/data partition is getting full.  That's not as common as /data/data
filling up though.  For the Samsung devices that mount a /datadata and
then symlink to /data/data, it should also work, as statfs dereferences
links first.  For all other devices with only /data, reading statfs on
/data/data still yields the total/free sizes of the /data partition.

(cherry picked from commit fc99763a)

Change-Id: I85ed6486c1085c4de2f5a7e825709f01d8cc8cba
parent 9a10df59

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

+3 −3
Original line number Diff line number Diff line
@@ -68,18 +68,18 @@ public class DeviceStorageMonitorService extends Binder { 
    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 int DEFAULT_FULL_THRESHOLD_BYTES = 1024*1024; // 1MB

    private long mFreeMem;  // on /data

    private long mFreeMem;  // on /data/data

    private long mLastReportedFreeMem;

    private long mLastReportedFreeMemTime;

    private boolean mLowMemFlag=false;

    private boolean mMemFullFlag=false;

    private Context mContext;

    private ContentResolver mContentResolver;

    private long mTotalMemory;  // on /data

    private long mTotalMemory;  // on /data/data

    private StatFs mDataFileStats;

    private StatFs mSystemFileStats;

    private StatFs mCacheFileStats;

    private static final String DATA_PATH = "/data";

    private static final String DATA_PATH = "/data/data"; // might not be the same fs as /data

    private static final String SYSTEM_PATH = "/system";

    private static final String CACHE_PATH = "/cache";

    private long mThreadStartTime = -1;