Merge "Stop controller from steal preference clicks" into rvc-dev

2020-02-26 04:32:52 +00:00
parent a4c7cb1ee2 bc0c7a626d
commit 9f6351b596
2 changed files with 19 additions and 1 deletions
--- a/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
@@ -62,7 +62,7 @@ public class ConversationPromotePreferenceController extends NotificationPrefere

    @Override
    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (mChannel == null) {
+        if (mChannel == null || !KEY.equals(preference.getKey())) {
            return false;
        }
        mChannel.setDemoted(false);