diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-01-23 15:53:05 -0800 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-01-23 16:10:40 -0800 |
| commit | 03a0f7d121452c961af651635cd6dd7347fe6bb3 (patch) | |
| tree | 276ba2cb541efd1c79be809245043936c72130b4 /src | |
| parent | 814ed0f5a3d7f015632f5911b0295c19fb9cf010 (diff) | |
| download | android_packages_apps_PackageInstaller-03a0f7d121452c961af651635cd6dd7347fe6bb3.tar.gz android_packages_apps_PackageInstaller-03a0f7d121452c961af651635cd6dd7347fe6bb3.tar.bz2 android_packages_apps_PackageInstaller-03a0f7d121452c961af651635cd6dd7347fe6bb3.zip | |
Do not skip when affected permissions aren't known
If the affected permissions are not known (targetSDK < N-MR1) do not
skip permission dialogs.
Test: atest android.appsecurity.cts.PermissionsHostTest
Bug: 72387749
Change-Id: I4f2d648c39b904010afa9b271d5aff58f658e697
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 3c01d00d..6efdcc81 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -273,12 +273,18 @@ public class GrantPermissionsActivity extends OverlayTouchActivity boolean allAffectedPermissionsOfThisGroupAreGranted = true; - for (int permNum = 0; permNum < groupState.affectedPermissions.length; - permNum++) { - if (!grantedPermissionNames.contains( - groupState.affectedPermissions[permNum])) { - allAffectedPermissionsOfThisGroupAreGranted = false; - break; + if (groupState.affectedPermissions == null) { + // It is not clear which permissions belong to this group, hence never skip this + // view + allAffectedPermissionsOfThisGroupAreGranted = false; + } else { + for (int permNum = 0; permNum < groupState.affectedPermissions.length; + permNum++) { + if (!grantedPermissionNames.contains( + groupState.affectedPermissions[permNum])) { + allAffectedPermissionsOfThisGroupAreGranted = false; + break; + } } } |