From b19b06b64c16b993d2701ae4ffb0374c16f196df Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Tue, 2 May 2017 18:54:40 -0700
Subject: [PATCH] Notification: Remove actions from public view

Change-Id: I9d95e2ea3ff89110f58f6d5585771ad301494e41
Test: Turn on "hide sensitive notifications on lockscreen", receive notification, make sure it has no actions
Fixes: 37907366
---
 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 602cccb1070dc..9a5885bd920a6 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4230,6 +4230,8 @@ public class Notification implements Parcelable
             mN.mLargeIcon = null;
             Bitmap largeIconLegacy = mN.largeIcon;
             mN.largeIcon = null;
+            ArrayList<Action> actions = mActions;
+            mActions = new ArrayList<>();
             Bundle publicExtras = new Bundle();
             publicExtras.putBoolean(EXTRA_SHOW_WHEN,
                     savedBundle.getBoolean(EXTRA_SHOW_WHEN));
@@ -4245,6 +4247,7 @@ public class Notification implements Parcelable
             mN.extras = savedBundle;
             mN.mLargeIcon = largeIcon;
             mN.largeIcon = largeIconLegacy;
+            mActions = actions;
             mStyle = style;
             return view;
         }