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

2017-01-31 00:17:19 +00:00
parent 4cedf3064a 2228136171
commit e122c245a9
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1913,6 +1913,9 @@ public class Notification implements Parcelable
            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