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

Commit ddff807b authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Consistent "low storage" behavior. 

When answering the question "how much space is free", use the same
logic for Settings UI and StorageManager.getAllocatableBytes().  That
is, the reported free space is usable bytes plus any cached data the
system is willing to delete automatically.

This does *not* include any reserved cache space, since we don't want
abusive apps to penalize other well-behaved apps that are storing
their data in cache locations.  Callers freeing cached data need to
now explicitly request defiance of the reserved cache space.  (Most
callers are already doing this by using FLAG_ALLOCATE_AGGRESSIVE.)

Rewrite the core logic of DeviceStorageMonitorService to understand
this new "reserved" cache space, and to be easier to understand.  It
also now handles cached data on adopted storage volumes, which had
been ignored until now.  Also fix bug where we had skipped "low"
broadcasts when the device skipped directly from/to "full" state.

Bug: 38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Icbdcf3b52775f7ada1ceaeff2f96094c8d8052f9
parent 1399d3ab

cmds/pm/src/com/android/commands/pm/Pm.java

+3 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.os.ShellCallback; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.Log;
@@ -1471,7 +1472,8 @@ public final class Pm { 
        }

        ClearDataObserver obs = new ClearDataObserver();

        try {

            mPm.freeStorageAndNotify(volumeUuid, sizeVal, obs);

            mPm.freeStorageAndNotify(volumeUuid, sizeVal,

                    StorageManager.FLAG_ALLOCATE_DEFY_RESERVED, obs);

            synchronized (obs) {

                while (!obs.finished) {

                    try {

core/java/android/app/ApplicationPackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2108,7 +2108,7 @@ public class ApplicationPackageManager extends PackageManager { 
    public void freeStorageAndNotify(String volumeUuid, long idealStorageSize,

            IPackageDataObserver observer) {

        try {

            mPM.freeStorageAndNotify(volumeUuid, idealStorageSize, observer);

            mPM.freeStorageAndNotify(volumeUuid, idealStorageSize, 0, observer);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2117,7 +2117,7 @@ public class ApplicationPackageManager extends PackageManager { 
    @Override

    public void freeStorage(String volumeUuid, long freeStorageSize, IntentSender pi) {

        try {

            mPM.freeStorage(volumeUuid, freeStorageSize, pi);

            mPM.freeStorage(volumeUuid, freeStorageSize, 0, pi);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/app/usage/IStorageStatsManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ interface IStorageStatsManager { 
    boolean isQuotaSupported(String volumeUuid, String callingPackage);

    long getTotalBytes(String volumeUuid, String callingPackage);

    long getFreeBytes(String volumeUuid, String callingPackage);

    long getCacheBytes(String volumeUuid, String callingPackage);

    long getCacheQuotaBytes(String volumeUuid, int uid, String callingPackage);

    StorageStats queryStatsForPackage(String volumeUuid, String packageName, int userId, String callingPackage);

    StorageStats queryStatsForUid(String volumeUuid, int uid, String callingPackage);

core/java/android/app/usage/StorageStatsManager.java

+18 −0
Original line number Diff line number Diff line
@@ -142,6 +142,24 @@ public class StorageStatsManager { 
        return getFreeBytes(convert(uuid));

    }



    /** {@hide} */

    public @BytesLong long getCacheBytes(@NonNull UUID storageUuid) throws IOException {

        try {

            return mService.getCacheBytes(convert(storageUuid), mContext.getOpPackageName());

        } catch (ParcelableException e) {

            e.maybeRethrow(IOException.class);

            throw new RuntimeException(e);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /** {@hide} */

    @Deprecated

    public long getCacheBytes(String uuid) throws IOException {

        return getCacheBytes(convert(uuid));

    }



    /**

     * Return storage statistics for a specific package on the requested storage

     * volume.

core/java/android/content/pm/IPackageManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ interface IPackageManager { 
     * the operation is completed

     */

     void freeStorageAndNotify(in String volumeUuid, in long freeStorageSize,

             IPackageDataObserver observer);

             int storageFlags, IPackageDataObserver observer);



    /**

     * Free storage by deleting LRU sorted list of cache files across
@@ -384,7 +384,7 @@ interface IPackageManager { 
     * to indicate that no call back is desired.

     */

     void freeStorage(in String volumeUuid, in long freeStorageSize,

             in IntentSender pi);

             int storageFlags, in IntentSender pi);



    /**

     * Delete all the cache files in an applications cache directory