diff options
| author | 2024-11-15 20:57:18 +0000 | |
|---|---|---|
| committer | 2024-11-15 20:57:18 +0000 | |
| commit | 7dacebe21abe2de0a37ed4068b0a31c656de3e34 (patch) | |
| tree | 61617cc6ec221029a679d93ab3ec25b492b3801b | |
| parent | 145ead3d89521897773d3a2edd1d2b1cdd1e4307 (diff) | |
| parent | 9aefcf79cea07a3b96502ce0c6781135f3254091 (diff) | |
Merge "Role re-evaluation should respect ask every time choice by user" into sc-dev am: 601b137a16 am: bd23cdc223 am: cb3c52b363 am: 7eab91848d am: 9aefcf79ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/30156633
Change-Id: Iaee6a6d8af0c88d0a1ef39b1c585eaac9c6953f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/role/model/Permissions.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/role/model/Permissions.java b/PermissionController/src/com/android/permissioncontroller/role/model/Permissions.java index 4bacdcf28..c65bccc6e 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/model/Permissions.java +++ b/PermissionController/src/com/android/permissioncontroller/role/model/Permissions.java @@ -253,7 +253,8 @@ public class Permissions { if (!wasPermissionOrAppOpGranted) { // If we've granted a permission which wasn't granted, it's no longer user set or fixed. newMask |= PackageManager.FLAG_PERMISSION_USER_FIXED - | PackageManager.FLAG_PERMISSION_USER_SET; + | PackageManager.FLAG_PERMISSION_USER_SET + | PackageManager.FLAG_PERMISSION_ONE_TIME; } // If a component gets a permission for being the default handler A and also default handler // B, we grant the weaker grant form. This only applies to default permission grant. @@ -607,7 +608,8 @@ public class Permissions { } if (!overrideUserSetAndFixed) { fixedFlags |= PackageManager.FLAG_PERMISSION_USER_FIXED - | PackageManager.FLAG_PERMISSION_USER_SET; + | PackageManager.FLAG_PERMISSION_USER_SET + | PackageManager.FLAG_PERMISSION_ONE_TIME; } return (flags & fixedFlags) != 0; } |