diff options
| author | 2015-10-13 00:23:25 +0000 | |
|---|---|---|
| committer | 2015-10-13 00:23:25 +0000 | |
| commit | f86aed1ed3bb7d16a0ee34596472d386c3964e31 (patch) | |
| tree | 465ebaa4430b0d4fbcc4754de1874dbe1b49fac1 | |
| parent | 68dcb30c2797e1b5546e37590dc43d9e6e0f1f42 (diff) | |
| parent | 30a4e6d514773b0be4235a4448a6848e26505ff3 (diff) | |
Merge "resolved conflicts for 8cbd7c8a to master"
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index f29dba263a5c..e500e1533524 100644 --- 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; } |