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

Commit 8695ec34 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 

* commit '38c0fbda':
  Pregrant unrevokable storage permission to the CertInstaller
parents 80688be6 38c0fbda

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

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.provider.CalendarContract; 
import android.provider.ContactsContract;

import android.provider.MediaStore;

import android.provider.Telephony.Sms.Intents;

import android.security.Credentials;

import android.util.ArraySet;

import android.util.Log;
@@ -298,6 +299,15 @@ final class DefaultPermissionGrantPolicy { 
                grantRuntimePermissionsLPw(storagePackage, STORAGE_PERMISSIONS, userId);

            }



            // CertInstaller

            Intent certInstallerIntent = new Intent(Credentials.INSTALL_ACTION);

            PackageParser.Package certInstallerPackage = getDefaultSystemHandlerActivityPackageLPr(

                    certInstallerIntent, userId);

            if (certInstallerPackage != null

                    && doesPackageSupportRuntimePermissions(certInstallerPackage)) {

                grantRuntimePermissionsLPw(certInstallerPackage, STORAGE_PERMISSIONS, true, userId);

            }



            // Dialer

            if (dialerAppPackageNames == null) {

                Intent dialerIntent = new Intent(Intent.ACTION_DIAL);