From 76fbeedee4f0643ae6d0bfb938a9d4455c7b554d Mon Sep 17 00:00:00 2001 From: Nicholas Sauer Date: Thu, 15 Aug 2019 23:16:38 -0700 Subject: [PATCH] Remove a break so that FLAG_PERMISSION_REVOKE_WHEN_REQUESTED is applied to permissions in all users. This addresses failures in SplitPermissionTest when run on secondary users. bug: 140274903 Test: cts-tradefed run cts-dev -m CtsPermissionTestCases -t android.permission.cts.SplitPermissionTest and... $ adb install CtsAppThatRequestsLocationPermission28.apk $ adb shell pm grant --user 10 android.permission.cts.appthatrequestpermission android.permission.ACCESS_COARSE_LOCATION $ adb shell pm grant --user 10 android.permission.cts.appthatrequestpermission android.permission.ACCESS_BACKGROUND_LOCATION $ adb install CtsAppThatRequestsLocationAndBackgroundPermission29.apk $ adb shell dumpsys package android.permission.cts.appthatrequestpermission and verify: USER_SENSITIVE_WHEN_GRANTED|USER_SENSITIVE_WHEN_DENIED] android.permission.ACCESS_BACKGROUND_LOCATION: granted=false Change-Id: I7191f06ea2e311113e0982d3b0b66aa5b1749ad9 --- .../android/server/pm/permission/PermissionManagerService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 899f8022dc8d7..e5c4617285bca 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -1595,8 +1595,6 @@ public class PermissionManagerService { Slog.i(TAG, newPerm + " does not inherit from " + sourcePerms + " for " + pkgName + " as split permission is also new"); } - - break; } else { // Inherit from new install or existing runtime permissions inheritPermissionStateToNewImplicitPermissionLocked(sourcePerms,