summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2015-10-12 16:55:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-12 16:55:52 +0000
commit8cbd7c8a8ad2f8512f9078731b757b0f0a2eeeb1 (patch)
tree733a868499406e27bde81e379fb28ab750879c0a
parent18b60e612f45fd7f8c57ae397a325a8eb7eec20f (diff)
parent8feaed95cfc79cc96a0c0a18c3db8154dd9f551a (diff)
am 8feaed95: am da5d9af8: am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '8feaed95cfc79cc96a0c0a18c3db8154dd9f551a': Default location is "internalOnly" when undefined.
-rw-r--r--core/java/android/app/ApplicationPackageManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 0adce5dc193d..7cae745fcf29 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -1619,7 +1619,8 @@ final class ApplicationPackageManager extends PackageManager {
// System apps and apps demanding internal storage can't be moved
// anywhere else
if (app.isSystemApp()
- || app.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
+ || app.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY
+ || app.installLocation == PackageInfo.INSTALL_LOCATION_UNSPECIFIED) {
return false;
}