From 9aaa114678342378c18ada8f3697f33a4ed4dc93 Mon Sep 17 00:00:00 2001
From: Sumedh Sen <sumedhsen@google.com>
Date: Mon, 3 Jun 2024 10:42:59 -0700
Subject: [PATCH] Update conditions for updates without user action for Android
V
-For Android V, updates without user action are permitted for apps
targeting API 33+
-Updated the conditions for SDK version check in PackageInstallerSession and associated
documentation in PackageInstaller.SesionParams
Bug: 325888262
Test: atest CtsSilentUpdateHostTestCases
Change-Id: Idfe3af5ac5f3a29016634b1486f0a94f7892a445
---
core/java/android/content/pm/PackageInstaller.java | 8 ++++++--
.../com/android/server/pm/PackageInstallerSession.java | 8 ++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index 270fc32a4e32..940e7d7118c0 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -3465,8 +3465,12 @@ public class PackageInstaller {
* Android S ({@link android.os.Build.VERSION_CODES#S API 31})</li>
* <li>{@link android.os.Build.VERSION_CODES#R API 30} or higher on
* Android T ({@link android.os.Build.VERSION_CODES#TIRAMISU API 33})</li>
- * <li>{@link android.os.Build.VERSION_CODES#S API 31} or higher <b>after</b>
- * Android T ({@link android.os.Build.VERSION_CODES#TIRAMISU API 33})</li>
+ * <li>{@link android.os.Build.VERSION_CODES#S API 31} or higher on
+ * Android U ({@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE API 34})
+ * </li>
+ * <li>{@link android.os.Build.VERSION_CODES#TIRAMISU API 33} or higher on
+ * Android V ({@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM API 35})
+ * </li>
* </ul>
* </li>
* <li>The installer is:
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 80a5f3a4c579..ed8324378595 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -316,14 +316,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
private static final int INCREMENTAL_STORAGE_UNHEALTHY_MONITORING_MS = 60000;
/**
- * If an app being installed targets {@link Build.VERSION_CODES#S API 31} and above, the app
- * can be installed without user action.
+ * If an app being installed targets {@link Build.VERSION_CODES#TIRAMISU API 33} and above,
+ * the app can be installed without user action.
* See {@link PackageInstaller.SessionParams#setRequireUserAction} for other conditions required
* to be satisfied for a silent install.
*/
@ChangeId
- @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)
- private static final long SILENT_INSTALL_ALLOWED = 265131695L;
+ @EnabledSince(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)
+ private static final long SILENT_INSTALL_ALLOWED = 325888262L;
/**
* The system supports pre-approval and update ownership features from
--
GitLab