From 7b3ad34741e1bd5d5381b849e17bd23fcec77fd1 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Wed, 26 Apr 2023 17:34:30 -0400 Subject: [PATCH] [Android] Java code adjustments for C114 upstream changes --- .../chromium/chrome/browser/signin/BraveSigninManager.java | 2 +- .../chrome/browser/tasks/BraveReturnToChromeUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java index 3655cf87431f..8321bc6cc226 100644 --- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java +++ b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java @@ -41,7 +41,7 @@ public boolean isSignOutAllowed() { } @Override - public boolean isSigninSupported() { + public boolean isSigninSupported(boolean requireUpdatedPlayServices) { return false; } diff --git a/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java b/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java index 9b30769b667b..1bf253c41917 100644 --- a/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java +++ b/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java @@ -8,11 +8,11 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; public final class BraveReturnToChromeUtil { - public static boolean shouldShowTabSwitcher(final long lastBackgroundedTimeMillis) { + public static boolean shouldShowTabSwitcher(final long lastTimeMillis, boolean isTablet) { if (!ChromeFeatureList.sStartSurfaceReturnTime.isEnabled()) { return false; } - return ReturnToChromeUtil.shouldShowTabSwitcher(lastBackgroundedTimeMillis); + return ReturnToChromeUtil.shouldShowTabSwitcher(lastTimeMillis, isTablet); } }