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

Commit 0f4454ce authored by Nan Wu's avatar Nan Wu Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev

parents 46f540cb 8d839e49

core/java/android/app/Notification.java

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

     * @hide

     */

    public void setAllowlistToken(@Nullable IBinder token) {

        mAllowlistToken = token;

    public void clearAllowlistToken() {

        mAllowlistToken = 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
@@ -4319,7 +4319,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(),