Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 143b6fc7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Skip building root hash if not incremental"

parents a4dd159b 2c5404ca

services/core/java/com/android/server/pm/VerifyingSession.java

+5 −3
Original line number Diff line number Diff line
@@ -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);

        }