Merge "Fix persistence bug with toggle actions"

2020-02-18 18:29:50 +00:00
parent 1c95829a27 7d7a7d94c3
commit e6d85ede20
1 changed files with 5 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
@@ -513,7 +513,11 @@ public class NotificationConversationInfo extends LinearLayout implements

    @Override
    public boolean shouldBeSaved() {
-        return mSelectedAction > -1;
+        // Toggle actions are already saved by the time the guts are closed; save for any other
+        // taps
+        return mSelectedAction > -1
+                && mSelectedAction != ACTION_FAVORITE
+                && mSelectedAction != ACTION_MUTE;
    }

    @Override