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

Commit 1aa73a1b authored by Kenny Root's avatar Kenny Root
Browse files

Add byte limit in addition to ratio for installs DO NOT MERGE 

Previously you were not allowed to install anything to the internal
storage if there was less than 10% free space available on the
internal storage. This doesn't make sense on devices with huge storage
capacity, so just add in a hard-coded byte limit.

This will be cleaned up at a later time to use the same code as
DeviceStorageMonitorService to determine the limits.

Bug: 4086510
Change-Id: I39f69b5272ef44fea218e3b45171b48e2eab2480
parent e65711b2

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+8 −4
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ public class DefaultContainerService extends IntentService { 
    // No-installation limit for internal flash: 10% or less space available

    private static final double LOW_NAND_FLASH_TRESHOLD = 0.1;



    // No-installation limit for internal flash: 150MB or less space available

    private static final long NAND_MIN_FREE_SPACE = (1024L * 1024L * 150L);



    // SD-to-internal app size threshold: currently set to 1 MB

    private static final long INSTALL_ON_SD_THRESHOLD = (1024 * 1024);

    private static final int ERR_LOC = -1;
@@ -451,7 +454,8 @@ public class DefaultContainerService extends IntentService { 
        String status = Environment.getExternalStorageState();

        long availSDSize = -1;

        boolean mediaAvailable = false;

        if (!Environment.isExternalStorageEmulated() && status.equals(Environment.MEDIA_MOUNTED)) {

        final boolean mediaEmulated = Environment.isExternalStorageEmulated();

        if (!mediaEmulated && status.equals(Environment.MEDIA_MOUNTED)) {

            StatFs sdStats = new StatFs(

                    Environment.getExternalStorageDirectory().getPath());

            availSDSize = (long)sdStats.getAvailableBlocks() *
@@ -474,7 +478,7 @@ public class DefaultContainerService extends IntentService { 
        // For dex files. Just ignore and fail when extracting. Max limit of 2Gig for now.

        long reqInternalSize = 0;

        boolean intThresholdOk = (pctNandFree >= LOW_NAND_FLASH_TRESHOLD);

        boolean intAvailOk = ((reqInstallSize + reqInternalSize) < availInternalSize);

        boolean intAvailOk = (reqInstallSize + reqInternalSize) < (availInternalSize - NAND_MIN_FREE_SPACE);

        boolean fitsOnSd = false;

        if (mediaAvailable && (reqInstallSize < availSDSize)) {

            // If we do not have an internal size requirement
@@ -485,7 +489,7 @@ public class DefaultContainerService extends IntentService { 
                fitsOnSd = true;

            }

        }

        boolean fitsOnInt = intThresholdOk && intAvailOk;

        boolean fitsOnInt = intThresholdOk || intAvailOk;

        if (checkInt) {

            // Check for internal memory availability

            if (fitsOnInt) {
@@ -506,7 +510,7 @@ public class DefaultContainerService extends IntentService { 
                return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;

            }

        }

        if ((checkExt || checkBoth) && !mediaAvailable) {

        if (!mediaEmulated && (checkExt || checkBoth) && !mediaAvailable) {

            return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE;

        }

        return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE;