resolved conflicts for 8cbd7c8a to master

Change-Id: I54dd1dbf2fd93c474e79d3d7be1b0bb57aff9ab7
2015-10-12 17:14:56 -07:00
parent d019d4ab3f 8cbd7c8a8a
commit 30a4e6d514
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -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;
        }