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

Merge "Block trampolines for browsers w/ targetSdk >= T" into tm-dev am: c9bf2574b4

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

Change-Id: I7c24059e45e2464de827ed7eb32a30ee6c969897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bernardo Rufino
2022-04-19 16:08:25 +00:00
committed by Automerger Merge Worker
parent 2bc621b8ea c9bf2574b4
commit 12090735bd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -459,6 +459,15 @@ public class NotificationManagerService extends SystemService {
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R) @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)
private static final long NOTIFICATION_TRAMPOLINE_BLOCK = 167676448L; private static final long NOTIFICATION_TRAMPOLINE_BLOCK = 167676448L;
/**
* Activity starts coming from broadcast receivers or services in response to notification and
* notification action clicks will be blocked for UX and performance reasons for previously
* exempt role holders (browser).
*/
@ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.S_V2)
private static final long NOTIFICATION_TRAMPOLINE_BLOCK_FOR_EXEMPT_ROLES = 227752274L;
/** /**
* Whether a notification listeners can understand new, more specific, cancellation reasons. * Whether a notification listeners can understand new, more specific, cancellation reasons.
*/ */
@@ -11532,7 +11541,8 @@ public class NotificationManagerService extends SystemService {
private boolean blockTrampoline(int uid) { private boolean blockTrampoline(int uid) {
if (mRoleObserver != null && mRoleObserver.isUidExemptFromTrampolineRestrictions(uid)) { if (mRoleObserver != null && mRoleObserver.isUidExemptFromTrampolineRestrictions(uid)) {
return false; return CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK_FOR_EXEMPT_ROLES,
uid);
} }
return CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid); return CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid);
} }