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

Commit ee77eced authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

Merge "Check signature match between Cert installer and Settings" into mnc-dev

parents 4bbe3d1f 307e3d04

src/com/android/settings/CredentialStorage.java

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.os.AsyncTask;
@@ -417,8 +418,10 @@ public final class CredentialStorage extends Activity { 
     */

    private boolean checkCallerIsCertInstallerOrSelfInProfile() {

        if (TextUtils.equals("com.android.certinstaller", getCallingPackage())) {

            // CertInstaller is allowed to install credentials

            return true;

            // CertInstaller is allowed to install credentials if it has the same signature as

            // Settings package.

            return getPackageManager().checkSignatures(

                    getCallingPackage(), getPackageName()) == PackageManager.SIGNATURE_MATCH;

        }



        final int launchedFromUserId;