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

Commit 1896c2e7 authored by Nan Wu's avatar Nan Wu
Browse files

DO NOT MERGE Fix BAL via notification.publicVersion 

We stripped the token that allows app to retrieve their own notification
and fire their own PI to launch activities from background. But we
forgot to strip the token from notification.publicVersion

Bug: 278558814
Test: NotificationManagerTest#testActivityStartFromRetrievedNotification_isBlocked
Change-Id: I8f25d7a5e47890a0496af023149717e1df482f98
(cherry picked from commit cf851d81)
parent 97084e84

core/java/android/app/Notification.java

+5 −2
Original line number Diff line number Diff line
@@ -3404,8 +3404,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








@@ -4341,7 +4341,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(),