From 4240aa775da3d9c0495fbb2ec766d8a6c54edeff Mon Sep 17 00:00:00 2001 From: brave-builds Date: Tue, 3 Jan 2023 21:35:50 +0000 Subject: [PATCH] Uplift of #16514 (squashed) to release --- .../org/chromium/chrome/browser/BraveFeatureUtil.java | 8 ++++++++ .../chrome/browser/settings/BraveMainPreferencesBase.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java b/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java index 6f693685272a..30facee54de8 100644 --- a/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java +++ b/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java @@ -15,6 +15,14 @@ public abstract class BraveFeatureUtil { public static final CachedFlag sTabSwitcherOnReturn = new CachedFlag(ChromeFeatureList.TAB_SWITCHER_ON_RETURN, false); + // The method sets a feature state that is passed in `enabled` var. However it can + // set the feature to a Default state if Default state is what is `enabled` var. + // For example: A feature `dummy_name` has 3 states and a Default value is Disabled: + // 0: Default (Disabled) + // 1: Enabled + // 2: Disabled + // enableFeature("dummy_name", false, true) sets the `dummy_name` feature state to Default + // enableFeature("dummy_name", false, false) sets the `dummy_name` feature state to Disabled public static void enableFeature( String featureName, boolean enabled, boolean fallbackToDefault) { BraveFeatureUtilJni.get().enableFeature(featureName, enabled, fallbackToDefault); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 6c8095460f16..cecb0cfae9a7 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -427,7 +427,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { if (PREF_BACKGROUND_VIDEO_PLAYBACK.equals(key)) { BraveFeatureUtil.enableFeature( BraveFeatureList.BRAVE_BACKGROUND_VIDEO_PLAYBACK_INTERNAL, (boolean) newValue, - true); + false); if ((boolean) newValue) { updateSummary(PREF_BACKGROUND_VIDEO_PLAYBACK, R.string.prefs_background_video_playback_on);