commit e122c245a96e74762016c305f311db1e5efdeaa5
author Dmitri Plotnikov <dplotnikov@google.com> Tue Jan 31 00:17:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 00:17:21 2017 +0000
tree 564836f062a346275d0c97948979a1a1a1a69508
parent 4cedf3064a99cfd2acbadae6b53d1ba93d9ffc0c
parent 2228136171a065c082eb7b85a511ddaf232c3be6

Merge "Protecting TvExtender from being stripped by lightenPayload()"

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 80f4985..dc9506c 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1913,6 +1913,9 @@
             final String[] keys = keyset.toArray(new String[N]);
             for (int i=0; i<N; i++) {
                 final String key = keys[i];
+                if (TvExtender.EXTRA_TV_EXTENDER.equals(key)) {
+                    continue;
+                }
                 final Object obj = extras.get(key);
                 if (obj != null &&
                     (  obj instanceof Parcelable