Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 am: fe90e0f750 am: cd83b8f450

Change-Id: I80e5fb347e321974a0cf97df76595cf29b36a5d1
2020-02-26 05:34:18 +00:00
parent 66ae75c8dd cd83b8f450
commit 22d09f7a23
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);