Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a3e4adf authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I00c3446193156e1ed8e166198c0038c37685b8fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 242f0f53 12090735

services/core/java/com/android/server/notification/NotificationManagerService.java

+11 −1
Original line number Original line Diff line number Diff line
@@ -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);











        }







        }