commit 5f393e1c010704740adfea5171f9004308edd5cf
author Adrian Roos <roosa@google.com> Wed May 03 21:36:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 21:36:22 2017 +0000
tree 8391d1a8e060e36a99b1b128db80bf2075b326d1
parent abd3e985ca04998311dfa9c496d73eca1bed1a39
parent b26c94ce4b8c252537e1e46637709470ffcb4c58

Merge "Notification: Remove actions from public view" into oc-dev am: 37963d61b2
am: b26c94ce4b

Change-Id: I1801ecae3fb327c8767f71d5e7f91c5cd581c448

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index c8b8c6c..2e56bcf 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4358,6 +4358,8 @@
             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));
@@ -4373,6 +4375,7 @@
             mN.extras = savedBundle;
             mN.mLargeIcon = largeIcon;
             mN.largeIcon = largeIconLegacy;
+            mActions = actions;
             mStyle = style;
             return view;
         }