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

Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97 am: e022945d69

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: I5725049a13c30e122e1f8b5e4e772b7431a4e32d
This commit is contained in:
Treehugger Robot
2020-09-14 22:44:28 +00:00
committed by Automerger Merge Worker
parent 9af4f1d300 e022945d69
commit bc93881957
5 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -958,7 +958,7 @@ public class Notification implements Parcelable
*
* @hide
*/
private IBinder mWhitelistToken;
private IBinder mAllowlistToken;
/**
* Must be set by a process to start associating tokens with Notification objects
@@ -966,7 +966,7 @@ public class Notification implements Parcelable
*
* @hide
*/
static public IBinder processWhitelistToken;
static public IBinder processAllowlistToken;
/**
* {@link #extras} key: this is the title of the notification,
@@ -2245,12 +2245,12 @@ public class Notification implements Parcelable
{
int version = parcel.readInt();
mWhitelistToken = parcel.readStrongBinder();
if (mWhitelistToken == null) {
mWhitelistToken = processWhitelistToken;
mAllowlistToken = parcel.readStrongBinder();
if (mAllowlistToken == null) {
mAllowlistToken = processAllowlistToken;
}
// Propagate this token to all pending intents that are unmarshalled from the parcel.
parcel.setClassCookie(PendingIntent.class, mWhitelistToken);
parcel.setClassCookie(PendingIntent.class, mAllowlistToken);
when = parcel.readLong();
creationTime = parcel.readLong();
@@ -2368,7 +2368,7 @@ public class Notification implements Parcelable
* @hide
*/
public void cloneInto(Notification that, boolean heavy) {
that.mWhitelistToken = this.mWhitelistToken;
that.mAllowlistToken = this.mAllowlistToken;
that.when = this.when;
that.creationTime = this.creationTime;
that.mSmallIcon = this.mSmallIcon;
@@ -2678,7 +2678,7 @@ public class Notification implements Parcelable
private void writeToParcelImpl(Parcel parcel, int flags) {
parcel.writeInt(1);
parcel.writeStrongBinder(mWhitelistToken);
parcel.writeStrongBinder(mAllowlistToken);
parcel.writeLong(when);
parcel.writeLong(creationTime);
if (mSmallIcon == null && icon != 0) {