diff options
| -rw-r--r-- | core/java/android/app/Notification.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 209286cd6d85..68d3a9203f12 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<Action> 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<Action> 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<Action> 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; } |