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

Commit 20741b43 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Correct error message for cross-package signature checks."

parents d59bc295 c62a7442

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

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import android.content.pm.Signature; 
import android.content.pm.SigningDetails;

import android.content.pm.parsing.ApkLiteParseUtils;

import android.content.pm.parsing.PackageLite;

import com.android.server.pm.pkg.component.ParsedMainComponent;

import android.content.pm.parsing.result.ParseResult;

import android.content.pm.parsing.result.ParseTypeImpl;

import android.os.Binder;
@@ -92,6 +91,7 @@ import com.android.server.compat.PlatformCompat; 
import com.android.server.pm.dex.PackageDexUsage;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.pm.pkg.component.ParsedMainComponent;

import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;



import dalvik.system.VMRuntime;
@@ -560,8 +560,8 @@ public class PackageManagerServiceUtils { 


            if (!match) {

                throw new PackageManagerException(INSTALL_FAILED_UPDATE_INCOMPATIBLE,

                        "Package " + packageName +

                        " signatures do not match previously installed version; ignoring!");

                        "Existing package " + packageName

                                + " signatures do not match newer version; ignoring!");

            }

        }

        // Check for shared user signatures