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

Commit 30a4e6d5 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for 8cbd7c8a to master 

Change-Id: I54dd1dbf2fd93c474e79d3d7be1b0bb57aff9ab7
parents d019d4ab 8cbd7c8a

core/java/android/app/ApplicationPackageManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1646,7 +1646,8 @@ public class ApplicationPackageManager extends PackageManager { 
            return false;

        }

        if (!forceAllowOnExternal

                && app.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {

                && (app.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY

                        || app.installLocation == PackageInfo.INSTALL_LOCATION_UNSPECIFIED)) {

            return false;

        }