commit 487726ad988abeb7b1278c0400737a59e6bcc196
author Nan Wu <wnan@google.com> Thu Aug 10 15:27:34 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 10 15:27:34 2023 +0000
tree 46bf5c524e9629127ed512840c2fbf3d303f17b4
parent 1b62907f784ce1a05e59ab22f7bde1d58e30cc98
parent 1896c2e7068c9ec1ab8355d863d7e8107d5d5706

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

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 1ecbed4..dbbea36 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3413,8 +3413,11 @@
      *
      * @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

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index f2f6dca..4ddc72e 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -4341,7 +4341,7 @@
                     // 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(),