Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip building root hash if not incremental"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-21 03:43:03 +00:00
committed by Android (Google) Code Review
parent a4dd159b40 2c5404cab5
commit 143b6fc71e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/VerifyingSession.java
View File

@@ -65,6 +65,7 @@ import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.incremental.IncrementalManager;
import android.provider.DeviceConfig;
import android.provider.Settings;
import android.text.TextUtils;
@@ -426,10 +427,11 @@ final class VerifyingSession {
final String baseCodePath = mPackageLite.getBaseApkPath();
final String[] splitCodePaths = mPackageLite.getSplitApkPaths();
final String rootHashString = PackageManagerServiceUtils.buildVerificationRootHashString(
baseCodePath, splitCodePaths);
if (rootHashString != null) {
if (IncrementalManager.isIncrementalPath(baseCodePath)) {
final String rootHashString =
PackageManagerServiceUtils.buildVerificationRootHashString(
baseCodePath, splitCodePaths);
verification.putExtra(PackageManager.EXTRA_VERIFICATION_ROOT_HASH, rootHashString);
}