From 2228136171a065c082eb7b85a511ddaf232c3be6 Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Mon, 30 Jan 2017 11:16:21 -0800
Subject: [PATCH] Protecting TvExtender from being stripped by lightenPayload()

Test: Verified manually that TvExtenders actually
arrive in LeanbackLauncher
Change-Id: I42bfc340f7e92bc15243f66c6ae24a330d569262
---
 core/java/android/app/Notification.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 82917d27d0d6b..87870ed422d7d 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1895,6 +1895,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