diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index ba53916be19..ca9e7ce21b1 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -1432,7 +1432,7 @@ public abstract class BraveActivity extends ChromeActivity // Check multiwindow toggle for upgrade case if (!isFirstInstall && !BraveMultiWindowUtils.isCheckUpgradeEnableMultiWindows() - && MultiWindowUtils.getInstanceCountWithFallback(PersistedInstanceType.ACTIVE) > 1 + && MultiWindowUtils.getInstanceCount(PersistedInstanceType.ACTIVE) > 1 && !BraveMultiWindowUtils.shouldEnableMultiWindows()) { BraveMultiWindowUtils.setCheckUpgradeEnableMultiWindows(true); BraveMultiWindowUtils.updateEnableMultiWindows(true); diff --git a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java index 15a15a2ba32..39a84cc096c 100644 --- a/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java +++ b/android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java @@ -86,7 +86,7 @@ class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 { Collections.singletonList(getCurrentInstanceId()), CloseWindowAppSource.NO_TABS_IN_WINDOW); } - if (MultiWindowUtils.getInstanceCountWithFallback(PersistedInstanceType.ACTIVE) == 1) { + if (MultiWindowUtils.getInstanceCount(PersistedInstanceType.ACTIVE) == 1) { BraveMultiWindowUtils.updateEnableMultiWindows(false); } else { Snackbar snackbar = diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 1b0fbd49595..90bd88e1c92 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -283,15 +283,14 @@ public class AppearancePreferences extends AppearanceSettingsFragment .writeBoolean(BravePreferenceKeys.BRAVE_TAB_GROUPS_ENABLED, (boolean) newValue); } else if (PREF_ENABLE_MULTI_WINDOWS.equals(key)) { if (!(boolean) newValue) { - if (MultiWindowUtils.getInstanceCountWithFallback(PersistedInstanceType.ACTIVE) - > 1) { + if (MultiWindowUtils.getInstanceCount(PersistedInstanceType.ACTIVE) > 1) { BraveMultiWindowDialogFragment dialogFragment = BraveMultiWindowDialogFragment.newInstance(); BraveMultiWindowDialogFragment.DismissListener dismissListener = new BraveMultiWindowDialogFragment.DismissListener() { @Override public void onDismiss() { - if (MultiWindowUtils.getInstanceCountWithFallback( + if (MultiWindowUtils.getInstanceCount( PersistedInstanceType.ACTIVE) == 1) { if (preference instanceof ChromeSwitchPreference) {