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

Merge "Proper grant default permissions to default SMS and Phone" into nyc-dev

Browse Source 
am: a0021cbb7f

* commit 'a0021cbb7fe9b1f97c0a31bd0681eb6c0f7f34a9':
  Proper grant default permissions to default SMS and Phone
This commit is contained in:
Svetoslav Ganov
2016-03-01 02:26:05 +00:00
committed by android-build-merger
parent 32b9036075 a0021cbb7f
commit 0d76bd7078
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,7 +788,7 @@ final class DefaultPermissionGrantPolicy {
} }
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions, private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
boolean systemFixed, boolean overrideUserChoice, int userId) { boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {
if (pkg.requestedPermissions.isEmpty()) { if (pkg.requestedPermissions.isEmpty()) {
return; return;
} }
@@ -796,7 +796,13 @@ final class DefaultPermissionGrantPolicy {
List<String> requestedPermissions = pkg.requestedPermissions; List<String> requestedPermissions = pkg.requestedPermissions;
Set<String> grantablePermissions = null; Set<String> grantablePermissions = null;
if (pkg.isUpdatedSystemApp()) { // If this is the default Phone or SMS app we grant permissions regardless
// whether the version on the system image declares the permission as used since
// selecting the app as the default Phone or SMS the user makes a deliberate
// choice to grant this app the permissions needed to function. For all other
// apps, (default grants on first boot and user creation) we don't grant default
// permissions if the version on the system image does not declare them.
if (!isDefaultPhoneOrSms && pkg.isUpdatedSystemApp()) {
PackageSetting sysPs = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName); PackageSetting sysPs = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName);
if (sysPs != null) { if (sysPs != null) {
if (sysPs.pkg.requestedPermissions.isEmpty()) { if (sysPs.pkg.requestedPermissions.isEmpty()) {
@@ -828,7 +834,7 @@ final class DefaultPermissionGrantPolicy {
// Unless the caller wants to override user choices. The override is // Unless the caller wants to override user choices. The override is
// to make sure we can grant the needed permission to the default // to make sure we can grant the needed permission to the default
// sms and phone apps after the user chooses this in the UI. // sms and phone apps after the user chooses this in the UI.
if (flags == 0 || overrideUserChoice) { if (flags == 0 || isDefaultPhoneOrSms) {
// Never clobber policy or system. // Never clobber policy or system.
final int fixedFlags = PackageManager.FLAG_PERMISSION_SYSTEM_FIXED final int fixedFlags = PackageManager.FLAG_PERMISSION_SYSTEM_FIXED
| PackageManager.FLAG_PERMISSION_POLICY_FIXED; | PackageManager.FLAG_PERMISSION_POLICY_FIXED;