From ee877e5c671d5b3850bd6db12cca1fe51930a190 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Mon, 25 Jan 2021 13:43:00 -0500 Subject: Remove a vestige of the reply action. Followup to I28992441300ffdecc58900730ff9d858d6c0a009 Bug: 163626038 Test: n/a Change-Id: I94ad332df5a095b7db9eb08797992a2e39a70c00 --- core/java/android/app/Notification.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index b166d31ce5df..ce9d2f180400 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3589,11 +3589,6 @@ public class Notification implements Parcelable private int mSecondaryTextColor = COLOR_INVALID; private int mBackgroundColor = COLOR_INVALID; private int mForegroundColor = COLOR_INVALID; - /** - * A temporary location where actions are stored. If != null the view originally has action - * but doesn't have any for this inflation. - */ - private ArrayList mOriginalActions; private boolean mRebuildStyledRemoteViews; private boolean mTintActionButtons; @@ -7407,11 +7402,10 @@ public class Notification implements Parcelable @Override public RemoteViews makeContentView(boolean increasedHeight) { if (increasedHeight) { - mBuilder.mOriginalActions = mBuilder.mActions; + ArrayList originalActions = mBuilder.mActions; mBuilder.mActions = new ArrayList<>(); RemoteViews remoteViews = makeBigContentView(); - mBuilder.mActions = mBuilder.mOriginalActions; - mBuilder.mOriginalActions = null; + mBuilder.mActions = originalActions; return remoteViews; } return super.makeContentView(increasedHeight); @@ -7906,12 +7900,11 @@ public class Notification implements Parcelable */ @Override public RemoteViews makeContentView(boolean increasedHeight) { - mBuilder.mOriginalActions = mBuilder.mActions; + ArrayList originalActions = mBuilder.mActions; mBuilder.mActions = new ArrayList<>(); RemoteViews remoteViews = makeMessagingView(true /* isCollapsed */, false /* hideLargeIcon */); - mBuilder.mActions = mBuilder.mOriginalActions; - mBuilder.mOriginalActions = null; + mBuilder.mActions = originalActions; return remoteViews; } -- cgit v1.2.3-59-g8ed1b