diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-14 22:44:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-14 22:44:28 +0000 |
| commit | bc93881957cd39e810aa67bea67ffe6a67da9c2a (patch) | |
| tree | 5f41853fd7232fa5f90f30efa058bd3e6a07b1c8 /core/java/android/app/Notification.java | |
| parent | 9af4f1d3000b9d5e56ac508b76f791563205c230 (diff) | |
| parent | e022945d69a3f31b9fed18c8bff2805d43914231 (diff) | |
Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97 am: e022945d69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048
Change-Id: I5725049a13c30e122e1f8b5e4e772b7431a4e32d
Diffstat (limited to 'core/java/android/app/Notification.java')
| -rw-r--r-- | core/java/android/app/Notification.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index af36260fedf2..2e42ae48e9b6 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -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) { |