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

Commit b63dfe98 authored by Nan Wu's avatar Nan Wu Committed by Android Build Coastguard Worker
Browse files

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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e79cbff7f85ea5497dcdb27b13535e4e3ac9913f)
Merged-In: I8f25d7a5e47890a0496af023149717e1df482f98
Change-Id: I8f25d7a5e47890a0496af023149717e1df482f98
parent da910035

core/java/android/app/Notification.java

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








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