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

Commit 9d0514d8 authored by Thomas Wendt's avatar Thomas Wendt Committed by Steve Kondik
Browse files

Storage: Fix moving apps to external storage 

This commits reverts the changes to PackageHelper.java made by commit
99d3b9 "Storage Add secondary storage support for app installation" to
fix moving/installing apps on the external storage for devices where the
secondary storage is used for USB OTG and not always mounted.

In commit 99d3b9 the logic was changed to check the secondary storage
without a fallback to the external storage in case of failure. Furthermore
the whole change seems incomplete as other parts of the package manager only
use the external storage.

Change-Id: I017899114fca2fe3c789e07dc74f8fa165df61d1
parent 5216b642

core/java/com/android/internal/content/PackageHelper.java

100755 → 100644
+7 −7
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ public class PackageHelper { 
            checkBoth = false;

        }



        final boolean noemulated = Environment.isNoEmulatedStorageExist();

        final boolean emulated = Environment.isExternalStorageEmulated();

        final StorageManager storage = StorageManager.from(context);



        boolean fitsOnInternal = false;
@@ -387,9 +387,9 @@ public class PackageHelper { 
        }



        boolean fitsOnExternal = false;

        if (noemulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)) {

        if (!emulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)) {

            final File target = new UserEnvironment(UserHandle.USER_OWNER)

                    .getSecondaryStorageDirectory();

                    .getExternalStorageDirectory();

            // External is only an option when size is known

            if (sizeBytes > 0) {

                fitsOnExternal = (sizeBytes <= storage.getStorageBytesUntilLow(target));
@@ -400,7 +400,7 @@ public class PackageHelper { 
            if (fitsOnInternal) {

                return PackageHelper.RECOMMEND_INSTALL_INTERNAL;

            }

        } else if (noemulated && prefer == RECOMMEND_INSTALL_EXTERNAL) {

        } else if (!emulated && prefer == RECOMMEND_INSTALL_EXTERNAL) {

            if (fitsOnExternal) {

                return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;

            }
@@ -409,7 +409,7 @@ public class PackageHelper { 
        if (checkBoth) {

            if (fitsOnInternal) {

                return PackageHelper.RECOMMEND_INSTALL_INTERNAL;

            } else if (noemulated && fitsOnExternal) {

            } else if (!emulated && fitsOnExternal) {

                return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;

            }

        }
@@ -419,8 +419,8 @@ public class PackageHelper { 
         * the media was unavailable. Otherwise, indicate there was insufficient

         * storage space available.

         */

        if (noemulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)

                && !Environment.MEDIA_MOUNTED.equals(Environment.getSecondaryStorageState())) {

        if (!emulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)

                && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {

            return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE;

        } else {

            return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE;