Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nan Wu
2023-08-03 12:42:16 +00:00
committed by Android (Google) Code Review
parent 46f540cb09 8d839e4985
commit 0f4454ce79
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/Notification.java
View File

@@ -3358,8 +3358,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();
}
} }
/** /**

2
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

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