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

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

Browse Source 
* commit '38c0fbda53399ac888e112d235e217fea220c2b7':
  Pregrant unrevokable storage permission to the CertInstaller
This commit is contained in:
Svetoslav Ganov
2015-08-06 19:12:25 +00:00
committed by Android Git Automerger
parent 80688be665 38c0fbda53
commit 8695ec34cf
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
View File

@@ -34,6 +34,7 @@ import android.provider.CalendarContract;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.provider.Telephony.Sms.Intents; import android.provider.Telephony.Sms.Intents;
import android.security.Credentials;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log; import android.util.Log;
@@ -298,6 +299,15 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(storagePackage, STORAGE_PERMISSIONS, userId); 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 // Dialer
if (dialerAppPackageNames == null) { if (dialerAppPackageNames == null) {
Intent dialerIntent = new Intent(Intent.ACTION_DIAL); Intent dialerIntent = new Intent(Intent.ACTION_DIAL);