Merge "Add install flag --bypass-low-target-sdk-block"

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,

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);
             }