commit 4efa381ee6979f7d4faf777382eb58c9d3347f51
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 12 20:22:56 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 12 20:22:56 2018 +0000
tree 3e97d931eb8c593123d813e52558de397821a9a1
parent 7b6e54c3e3a86b74d42111228df21b7aa8fa8edf
parent ff10c9c09600a83e0f47428db9499d40500028ed

Merge "Fixes force-uuid behavior"

services/core/java/com/android/server/pm/PackageInstallerService.java

diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 57922d0..bbec6a0 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -486,10 +486,12 @@
                 if (!PackageHelper.fitsOnInternal(mContext, params)) {
                     throw new IOException("No suitable internal storage available");
                 }
-            } else {
+            } else if ((params.installFlags & PackageManager.INSTALL_FORCE_VOLUME_UUID) != 0) {
                 // For now, installs to adopted media are treated as internal from
                 // an install flag point-of-view.
                 params.installFlags |= PackageManager.INSTALL_INTERNAL;
+            } else {
+                params.installFlags |= PackageManager.INSTALL_INTERNAL;
 
                 // Resolve best location for install, based on combination of
                 // requested install flags, delta size, and manifest settings.