am f31f4cdc: am 53d17aee: Merge "Give fixed READ_PHONE_STATE permission to calllog provider" into mnc-dev

* commit 'f31f4cdc3aa868af0af0ddccba00ea389c5c2ada':
  Give fixed READ_PHONE_STATE permission to calllog provider
This commit is contained in:
Makoto Onuki
2015-07-07 20:42:53 +00:00
committed by Android Git Automerger

View File

@@ -429,6 +429,8 @@ final class DefaultPermissionGrantPolicy {
if (contactsProviderPackage != null) { if (contactsProviderPackage != null) {
grantRuntimePermissionsLPw(contactsProviderPackage, CONTACTS_PERMISSIONS, grantRuntimePermissionsLPw(contactsProviderPackage, CONTACTS_PERMISSIONS,
true, userId); true, userId);
grantRuntimePermissionsLPw(contactsProviderPackage, PHONE_PERMISSIONS,
true, userId);
grantRuntimePermissionsLPw(contactsProviderPackage, ACCOUNTS_PERMISSIONS, userId); grantRuntimePermissionsLPw(contactsProviderPackage, ACCOUNTS_PERMISSIONS, userId);
grantRuntimePermissionsLPw(contactsProviderPackage, STORAGE_PERMISSIONS, userId); grantRuntimePermissionsLPw(contactsProviderPackage, STORAGE_PERMISSIONS, userId);
} }