summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kovacs <nrkovacs@google.com> 2023-01-27 21:20:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-27 21:20:07 +0000
commit9e72233c66dc72b6d61263419194fb8b1b6ee0ec (patch)
treee4e4571696792a29b339ae213ebc333f9a750c99
parent8799b64ddd4228245275366d2779d4ef9e8361d2 (diff)
parent8b33a118c1774f53e12d00e4d4889a77150e7f8d (diff)
Merge "Add install flag --bypass-low-target-sdk-block" am: e39d3e9347 am: 8b33a118c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401860 Change-Id: I3f7ad895a1cf36942a1e8c4d8cf570e83eea7032 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/content/pm/PackageManager.java8
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerShellCommand.java4
2 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index d83ad3d0850a..f1e37243003c 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1530,6 +1530,14 @@ public abstract class PackageManager {
*/
public static final int INSTALL_DISABLE_ALLOWED_APEX_UPDATE_CHECK = 0x00400000;
+ /**
+ * Flag parameter for {@link #installPackage} to bypass the low target sdk version block
+ * for this install.
+ *
+ * @hide
+ */
+ public static final int INSTALL_BYPASS_LOW_TARGET_SDK_BLOCK = 0x01000000;
+
/** @hide */
@IntDef(flag = true, value = {
DONT_KILL_APP,
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 89719ce99ac9..958eb64b833b 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -3184,6 +3184,10 @@ class PackageManagerShellCommand extends ShellCommand {
case "--skip-verification":
sessionParams.installFlags |= PackageManager.INSTALL_DISABLE_VERIFICATION;
break;
+ case "--bypass-low-target-sdk-block":
+ sessionParams.installFlags |=
+ PackageManager.INSTALL_BYPASS_LOW_TARGET_SDK_BLOCK;
+ break;
default:
throw new IllegalArgumentException("Unknown option " + opt);
}