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

Commit f86aed1e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for 8cbd7c8a to master"

parents 68dcb30c 30a4e6d5
Loading
Loading
Loading
Loading
+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;
        }