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

Change-Id: Ide5a5710d57542e239105c5e14ab11f3167ab42b
2020-02-26 05:00:35 +00:00
parent 7d8bcb087d 907051e8c0
commit fe90e0f750
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);