From e53a7b20200d79a4cc8bbe5da51e36fddc4c5922 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Tue, 2 Nov 2021 15:21:23 -0700
Subject: [PATCH] Add Incremental extras to ACTION_PACKAGE_NEEDS_VERIFICATION.

Not yet enabling verification for Incremental. Needs some work in Play first (see blocking bug).

Bug: 204810986
Test: manual, enabled verification for Incremental installs and logged
the extras.

Change-Id: Ic601d4c49969c920c1dabb07f8311932c560b2d8
---
 .../com/android/server/pm/VerificationParams.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/services/core/java/com/android/server/pm/VerificationParams.java b/services/core/java/com/android/server/pm/VerificationParams.java
index fc1bb45c55977..4dbc5d5db7fd4 100644
--- a/services/core/java/com/android/server/pm/VerificationParams.java
+++ b/services/core/java/com/android/server/pm/VerificationParams.java
@@ -387,6 +387,18 @@ final class VerificationParams extends HandlerParams {
                     PackageManager.EXTRA_VERIFICATION_LONG_VERSION_CODE,
                     pkgLite.getLongVersionCode());
 
+            final String baseCodePath = mPackageLite.getBaseApkPath();
+            final String[] splitCodePaths = mPackageLite.getSplitApkPaths();
+            final String rootHashString =
+                    PackageManagerServiceUtils.buildVerificationRootHashString(baseCodePath,
+                            splitCodePaths);
+
+            if (rootHashString != null) {
+                verification.putExtra(PackageManager.EXTRA_VERIFICATION_ROOT_HASH, rootHashString);
+            }
+
+            verification.putExtra(PackageInstaller.EXTRA_DATA_LOADER_TYPE, mDataLoaderType);
+
             populateInstallerExtras(verification);
 
             final List<ComponentName> sufficientVerifiers = matchVerifiers(pkgLite,