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

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

Merge "RESTRICT AUTOMERGE Fix BAL via notification.publicVersion" into udc-dev-plus-aosp

parents 2e641a31 1e7750bc

core/java/android/app/Notification.java

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

     *

     * @hide

     * @hide

     */

     */

    public void setAllowlistToken(@Nullable IBinder token) {

    public void clearAllowlistToken() {

        mAllowlistToken = token;

        mAllowlistToken = null;

        if (publicVersion != null) {

            publicVersion.clearAllowlistToken();

        }

    }

    }

















    /**







    /**

































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



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -4442,7 +4442,7 @@ public class NotificationManagerService extends SystemService {









                    // Remove background token before returning notification to untrusted app, this







                    // Remove background token before returning notification to untrusted app, this











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







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











                    // associated with notification interactions.







                    // associated with notification interactions.











                    notification.setAllowlistToken(null);







                    notification.clearAllowlistToken();











                    return new StatusBarNotification(







                    return new StatusBarNotification(











                            sbn.getPackageName(),







                            sbn.getPackageName(),











                            sbn.getOpPkg(),







                            sbn.getOpPkg(),