Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2238)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

Issue 2052613002: [Android, Settings] Fix NPE when both media related site settings are enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pause-when-unmute
Patch Set: Rebased on master Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
index 14b32f48a9536addf1107d1bc300843a9290a7a7..7dcf761e3a42a3b938f64322d4561389f005fbe3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
@@ -158,7 +158,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
// When showing the main menu, only one of these two will be visible, at most.
if (mProtectedContentMenuAvailable && !mAutoplayMenuAvailable) {
websitePrefs.add(PROTECTED_CONTENT_KEY);
- } else if (mAutoplayMenuAvailable) {
+ } else if (mAutoplayMenuAvailable && !mProtectedContentMenuAvailable) {
websitePrefs.add(AUTOPLAY_KEY);
}
websitePrefs.add(BACKGROUND_SYNC_KEY);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698