Merge "Notification: Remove actions from public view" into oc-dev

am: 37963d61b2 Change-Id: I845cdc55b23f797b81adc08ef554831018822777
2017-05-03 21:23:01 +00:00
parent 2820e21299 37963d61b2
commit b26c94ce4b
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4358,6 +4358,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));
@@ -4373,6 +4375,7 @@ public class Notification implements Parcelable
            mN.extras = savedBundle;
            mN.mLargeIcon = largeIcon;
            mN.largeIcon = largeIconLegacy;
+            mActions = actions;
            mStyle = style;
            return view;
        }