diff options
| author | 2019-01-24 12:01:41 +0000 | |
|---|---|---|
| committer | 2019-01-24 12:01:41 +0000 | |
| commit | bf4595621748a37d3c0ae2d6297dcad9f24cf77d (patch) | |
| tree | 907886cb0e78c3cb0f880a64da69e07d654f017a | |
| parent | 5fa8cb3802551507ccf3de0b699136c757b25b44 (diff) | |
| parent | 3fa46d867909f77de7be5fd8f5b4740fe4e6d1e7 (diff) | |
Merge "Expose an API to mark a session as APEX."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageInstaller.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerShellCommand.java | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 912d52e08f42..946b975bc8f0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11441,6 +11441,7 @@ package android.content.pm { method public void setAppIcon(@Nullable android.graphics.Bitmap); method public void setAppLabel(@Nullable CharSequence); method public void setAppPackageName(@Nullable String); + method public void setInstallAsApex(); method public void setInstallLocation(int); method public void setInstallReason(int); method public void setMultiPackage(); diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 94b7c4538c51..73b1f4e7e536 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1543,6 +1543,13 @@ public class PackageInstaller { this.isStaged = true; } + /** + * Set this session to be installing an APEX package. + */ + public void setInstallAsApex() { + installFlags |= PackageManager.INSTALL_APEX; + } + /** {@hide} */ public void dump(IndentingPrintWriter pw) { pw.printPair("mode", mode); diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 35626304be1a..692c032b1f70 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -2307,7 +2307,7 @@ class PackageManagerShellCommand extends ShellCommand { sessionParams.installFlags |= PackageManager.INSTALL_FORCE_SDK; break; case "--apex": - sessionParams.installFlags |= PackageManager.INSTALL_APEX; + sessionParams.setInstallAsApex(); sessionParams.setStaged(); break; case "--multi-package": |