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

Commit 0e60d064 authored by Nan Wu's avatar Nan Wu Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 

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



Change-Id: Iced365d9bef5572692a48787e226264b27a2bd82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b74ba44 75fcbb37

core/java/android/app/Notification.java

+5 −2
Original line number Diff line number Diff line
@@ -3078,8 +3078,11 @@ public class Notification implements Parcelable 
     *

     * @hide

     */

    public void setAllowlistToken(@Nullable IBinder token) {

        mWhitelistToken = token;

    public void clearAllowlistToken() {

        mWhitelistToken = null;

        if (publicVersion != null) {

            publicVersion.clearAllowlistToken();

        }

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -3952,7 +3952,7 @@ public class NotificationManagerService extends SystemService { 
                    // Remove background token before returning notification to untrusted app, this

                    // ensures the app isn't able to perform background operations that are

                    // associated with notification interactions.

                    notification.setAllowlistToken(null);

                    notification.clearAllowlistToken();

                    return new StatusBarNotification(

                            sbn.getPackageName(),

                            sbn.getOpPkg(),