Merge "Bump min SDK level" into main
diff --git a/core/java/android/content/pm/flags.aconfig b/core/java/android/content/pm/flags.aconfig
index f31521d..5e9d8f0 100644
--- a/core/java/android/content/pm/flags.aconfig
+++ b/core/java/android/content/pm/flags.aconfig
@@ -206,3 +206,11 @@
description: "Feature flag to enable pre-verified domains"
bug: "307327678"
}
+
+flag {
+ name: "min_target_sdk_24"
+ namespace: "responsible_apis"
+ description: "Feature flag to bump min target sdk to 24"
+ bug: "297603927"
+ is_fixed_read_only: true
+}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index b8960da..5b168c4 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -569,7 +569,8 @@
* target sdk apps as malware can target older sdk versions to avoid
* the enforcement of new API behavior.
*/
- public static final int MIN_INSTALLABLE_TARGET_SDK = Build.VERSION_CODES.M;
+ public static final int MIN_INSTALLABLE_TARGET_SDK =
+ Flags.minTargetSdk24() ? Build.VERSION_CODES.N : Build.VERSION_CODES.M;
// Compilation reasons.
// TODO(b/260124949): Clean this up with the legacy dexopt code.