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

Merge "Remove temp handling of POST_NOTIFICATIONS" into tm-dev am: 65dc0639fc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17357580

Change-Id: I20bfa80620f2e39a2588025a34088669d2ad67ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2022-04-20 22:46:28 +00:00
committed by Automerger Merge Worker
parent c95a69e6ef 65dc0639fc
commit 143e8054e2
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -2645,12 +2645,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// Cache newImplicitPermissions before modifing permissionsState as for the // Cache newImplicitPermissions before modifing permissionsState as for the
// shared uids the original and new state are the same object // shared uids the original and new state are the same object
// TODO(205888750): remove the line for LEGACY_REVIEW once propagated through
// droidfood
if (!origState.hasPermissionState(permName) if (!origState.hasPermissionState(permName)
&& (pkg.getImplicitPermissions().contains(permName) && (pkg.getImplicitPermissions().contains(permName)
|| (permName.equals(Manifest.permission.ACTIVITY_RECOGNITION))) || (permName.equals(Manifest.permission.ACTIVITY_RECOGNITION)))) {
|| NOTIFICATION_PERMISSIONS.contains(permName)) {
if (pkg.getImplicitPermissions().contains(permName)) { if (pkg.getImplicitPermissions().contains(permName)) {
// If permName is an implicit permission, try to auto-grant // If permName is an implicit permission, try to auto-grant
newImplicitPermissions.add(permName); newImplicitPermissions.add(permName);