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

Merge "Avoid trying to grant non-ephemeral permissions to instant apps"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-16 21:27:35 +00:00
committed by Android (Google) Code Review
parent f596ba9375 64814139ad
commit 4fd6eb6192
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2038,12 +2038,15 @@ public class PackageManagerService extends IPackageManager.Stub {
final boolean supportsRuntimePermissions = pkg.applicationInfo.targetSdkVersion
>= Build.VERSION_CODES.M;
final boolean instantApp = isInstantApp(pkg.packageName, userId);
for (String permission : pkg.requestedPermissions) {
final BasePermission bp;
synchronized (mPackages) {
bp = mSettings.mPermissions.get(permission);
}
if (bp != null && (bp.isRuntime() || bp.isDevelopment())
&& (!instantApp || bp.isInstant())
&& (grantedPermissions == null
|| ArrayUtils.contains(grantedPermissions, permission))) {
final int flags = permissionsState.getPermissionFlags(permission, userId);