diff --git a/patches/BRM065_Add-privacy-option-to-keep-cookies-until-session-exit.patch b/patches/BRM065_Add-site-settings-option-for-session-only-cookies.patch similarity index 99% rename from patches/BRM065_Add-privacy-option-to-keep-cookies-until-session-exit.patch rename to patches/BRM065_Add-site-settings-option-for-session-only-cookies.patch index fe3fdc1c..9f8a2b6a 100644 --- a/patches/BRM065_Add-privacy-option-to-keep-cookies-until-session-exit.patch +++ b/patches/BRM065_Add-site-settings-option-for-session-only-cookies.patch @@ -1,6 +1,6 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 28 Aug 2018 23:27:23 +0200 -Subject: Add privacy option to keep cookies until session exit +Subject: Add site settings option for session-only cookies --- chrome/android/java/res/values/values.xml | 3 +++ diff --git a/patches/BRM071_Disable-fetching-of-all-field-trials.patch b/patches/BRM071_Disable-fetching-of-all-field-trials.patch index 5944eddf..109178ea 100644 --- a/patches/BRM071_Disable-fetching-of-all-field-trials.patch +++ b/patches/BRM071_Disable-fetching-of-all-field-trials.patch @@ -4,8 +4,8 @@ Subject: Disable fetching of all field trials --- .../src/org/chromium/chrome/browser/ChromeFeatureList.java | 12 +++--------- - components/variations/service/variations_service.cc | 4 ++++ - 2 files changed, 7 insertions(+), 9 deletions(-) + components/variations/service/variations_service.cc | 12 +----------- + 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java @@ -46,21 +46,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc -@@ -225,6 +225,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, +@@ -225,17 +225,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, // Variations seed fetching is only enabled in official Chrome builds, if a URL // is specified on the command line, and for testing. bool IsFetchingEnabled() { -+#if 0 - #if !defined(GOOGLE_CHROME_BUILD) - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kVariationsServerURL) && -@@ -236,6 +237,9 @@ bool IsFetchingEnabled() { - } - #endif - return true; -+#else +-#if !defined(GOOGLE_CHROME_BUILD) +- if (!base::CommandLine::ForCurrentProcess()->HasSwitch( +- switches::kVariationsServerURL) && +- !g_should_fetch_for_testing) { +- DVLOG(1) +- << "Not performing repeated fetching in unofficial build without --" +- << switches::kVariationsServerURL << " specified."; +- return false; +- } +-#endif +- return true; + return false; -+#endif } std::unique_ptr MaybeImportFirstRunSeed( diff --git a/patches/BRM090_kill-Auth.patch b/patches/BRM090_kill-Auth.patch deleted file mode 100644 index 861e2b40..00000000 --- a/patches/BRM090_kill-Auth.patch +++ /dev/null @@ -1,132 +0,0 @@ -From: thermatk -Date: Fri, 22 Jun 2018 17:06:15 +0200 -Subject: kill Auth - ---- - .../org/chromium/chrome/browser/signin/SigninHelper.java | 6 ++---- - .../org/chromium/components/signin/AccountIdProvider.java | 9 +-------- - .../components/signin/SystemAccountManagerDelegate.java | 15 +++++++++------ - 3 files changed, 12 insertions(+), 18 deletions(-) - -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java -@@ -8,10 +8,6 @@ import android.accounts.Account; - import android.annotation.SuppressLint; - import android.content.Context; - --import com.google.android.gms.auth.AccountChangeEvent; --import com.google.android.gms.auth.GoogleAuthException; --import com.google.android.gms.auth.GoogleAuthUtil; -- - import org.chromium.base.AsyncTask; - import org.chromium.base.ContextUtils; - import org.chromium.base.Log; -@@ -71,6 +67,7 @@ public class SigninHelper { - @Override - public List getAccountChangeEvents( - Context context, int index, String accountName) { -+ /* - try { - List list = GoogleAuthUtil.getAccountChangeEvents( - context, index, accountName); -@@ -88,6 +85,7 @@ public class SigninHelper { - } catch (GoogleAuthException e) { - Log.w(TAG, "Failed to get change events", e); - } -+ */ - return new ArrayList<>(0); - } - } -diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java ---- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java -+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java -@@ -4,8 +4,6 @@ - - package org.chromium.components.signin; - --import com.google.android.gms.auth.GoogleAuthException; --import com.google.android.gms.auth.GoogleAuthUtil; - import com.google.android.gms.common.ConnectionResult; - import com.google.android.gms.common.GoogleApiAvailability; - -@@ -40,12 +38,7 @@ public class AccountIdProvider { - * @param accountName The email address of a Google account. - */ - public String getAccountId(String accountName) { -- try { -- return GoogleAuthUtil.getAccountId(ContextUtils.getApplicationContext(), accountName); -- } catch (IOException | GoogleAuthException ex) { -- Log.e("cr.AccountIdProvider", "AccountIdProvider.getAccountId", ex); -- return null; -- } -+ return null; - } - - /** -diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java ---- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -@@ -24,9 +24,6 @@ import android.os.PatternMatcher; - import android.os.Process; - import android.os.SystemClock; - --import com.google.android.gms.auth.GoogleAuthException; --import com.google.android.gms.auth.GoogleAuthUtil; --import com.google.android.gms.auth.GooglePlayServicesAvailabilityException; - import com.google.android.gms.common.ConnectionResult; - import com.google.android.gms.common.GoogleApiAvailability; - -@@ -117,9 +114,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - // so don't report any accounts if Google Play Services are out of date. - checkCanUseGooglePlayServices(); - -- if (!hasGetAccountsPermission()) { -- return new Account[] {}; -- } -+ return new Account[] {}; -+ -+ /* - long now = SystemClock.elapsedRealtime(); - Account[] accounts = mAccountManager.getAccountsByType(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE); - long elapsed = SystemClock.elapsedRealtime() - now; -@@ -129,12 +126,15 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - "Signin.AndroidGetAccountsTimeUiThread_AccountManager", elapsed); - } - return accounts; -+ */ - } - - @Override - public String getAuthToken(Account account, String authTokenScope) throws AuthException { - assert !ThreadUtils.runningOnUiThread(); - assert AccountManagerFacade.GOOGLE_ACCOUNT_TYPE.equals(account.type); -+ return null; -+ /* - try { - return GoogleAuthUtil.getTokenWithNotification( - ContextUtils.getApplicationContext(), account, authTokenScope, null); -@@ -146,10 +146,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - } catch (IOException ex) { - throw new AuthException(AuthException.TRANSIENT, ex); - } -+ */ - } - - @Override - public void invalidateAuthToken(String authToken) throws AuthException { -+ /* - try { - GoogleAuthUtil.clearToken(ContextUtils.getApplicationContext(), authToken); - } catch (GooglePlayServicesAvailabilityException ex) { -@@ -159,6 +161,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - } catch (IOException ex) { - throw new AuthException(AuthException.TRANSIENT, ex); - } -+ */ - } - - @Override --- -2.11.0 - diff --git a/patches/BRM092_kill-TOS-and-metrics-opt-out.patch b/patches/BRM090_kill-TOS-and-metrics-opt-out.patch similarity index 100% rename from patches/BRM092_kill-TOS-and-metrics-opt-out.patch rename to patches/BRM090_kill-TOS-and-metrics-opt-out.patch diff --git a/patches/BRM093_kill-Translate-doesn-t-work.patch b/patches/BRM091_kill-Translate-doesn-t-work.patch similarity index 100% rename from patches/BRM093_kill-Translate-doesn-t-work.patch rename to patches/BRM091_kill-Translate-doesn-t-work.patch diff --git a/patches/BRM091_kill-remaining-Play-Services-checks.patch b/patches/BRM091_kill-remaining-Play-Services-checks.patch deleted file mode 100644 index ceda4d3c..00000000 --- a/patches/BRM091_kill-remaining-Play-Services-checks.patch +++ /dev/null @@ -1,323 +0,0 @@ -From: thermatk -Date: Fri, 22 Jun 2018 17:13:38 +0200 -Subject: kill remaining Play Services checks - ---- - .../chromium/chrome/browser/ChromeVersionInfo.java | 10 +------- - .../browser/externalauth/ExternalAuthUtils.java | 28 +++++++--------------- - .../externalauth/UserRecoverableErrorHandler.java | 10 -------- - .../chrome/browser/omaha/UpdateMenuItemHelper.java | 10 +------- - chrome/android/java_sources.gni | 3 --- - .../components/signin/AccountIdProvider.java | 10 +------- - .../signin/GmsAvailabilityException.java | 4 +--- - .../signin/SystemAccountManagerDelegate.java | 18 +++----------- - .../shape_detection/FaceDetectionProviderImpl.java | 8 +------ - 9 files changed, 16 insertions(+), 85 deletions(-) - -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java -@@ -7,8 +7,6 @@ package org.chromium.chrome.browser; - import android.content.Context; - import android.content.pm.PackageManager; - --import com.google.android.gms.common.GoogleApiAvailability; -- - import org.chromium.base.ContextUtils; - import org.chromium.base.annotations.CalledByNative; - import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; -@@ -88,7 +86,7 @@ public class ChromeVersionInfo { - public static String getGmsInfo() { - Context context = ContextUtils.getApplicationContext(); - -- final long sdkVersion = GoogleApiAvailability.GOOGLE_PLAY_SERVICES_VERSION_CODE; -+ final long sdkVersion = 0L; - final long installedGmsVersion = getPlayServicesApkVersionNumber(context); - - final String accessType; -@@ -105,12 +103,6 @@ public class ChromeVersionInfo { - } - - private static long getPlayServicesApkVersionNumber(Context context) { -- try { -- return context.getPackageManager() -- .getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, 0) -- .versionCode; -- } catch (PackageManager.NameNotFoundException e) { - return 0; -- } - } - } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java -@@ -15,9 +15,6 @@ import android.os.SystemClock; - import android.support.annotation.WorkerThread; - import android.text.TextUtils; - --import com.google.android.gms.common.ConnectionResult; --import com.google.android.gms.common.GoogleApiAvailability; -- - import org.chromium.base.ContextUtils; - import org.chromium.base.Log; - import org.chromium.base.ThreadUtils; -@@ -164,9 +161,10 @@ public class ExternalAuthUtils { - * when it is updating. - */ - public boolean isGooglePlayServicesMissing(final Context context) { -- final int resultCode = checkGooglePlayServicesAvailable(context); -+/* final int resultCode = checkGooglePlayServicesAvailable(context); - return (resultCode == ConnectionResult.SERVICE_MISSING -- || resultCode == ConnectionResult.SERVICE_INVALID); -+ || resultCode == ConnectionResult.SERVICE_INVALID); */ -+ return true; - } - - /** -@@ -181,7 +179,7 @@ public class ExternalAuthUtils { - * @return true if and only if Google Play Services can be used - */ - public boolean canUseGooglePlayServices(final UserRecoverableErrorHandler errorHandler) { -- Context context = ContextUtils.getApplicationContext(); -+/* Context context = ContextUtils.getApplicationContext(); - final int resultCode = checkGooglePlayServicesAvailable(context); - recordConnectionResult(resultCode); - if (resultCode == ConnectionResult.SUCCESS) return true; -@@ -195,7 +193,7 @@ public class ExternalAuthUtils { - } - }; - ThreadUtils.runOnUiThread(errorHandlerTask); -- } -+ } */ - return false; - } - -@@ -257,17 +255,7 @@ public class ExternalAuthUtils { - * @return The code produced by calling the external code - */ - protected int checkGooglePlayServicesAvailable(final Context context) { -- // Temporarily allowing disk access. TODO: Fix. See http://crbug.com/577190 -- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); -- try { -- long time = SystemClock.elapsedRealtime(); -- int isAvailable = -- GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context); -- mRegistrationTimeHistogramSample.record(SystemClock.elapsedRealtime() - time); -- return isAvailable; -- } finally { -- StrictMode.setThreadPolicy(oldPolicy); -- } -+ return 1; - } - - /** -@@ -278,7 +266,7 @@ public class ExternalAuthUtils { - * @return true If the code represents a user-recoverable error - */ - protected boolean isUserRecoverableError(final int errorCode) { -- return GoogleApiAvailability.getInstance().isUserResolvableError(errorCode); -+ return false; - } - - /** -@@ -288,6 +276,6 @@ public class ExternalAuthUtils { - * @return a textual description of the error code - */ - protected String describeError(final int errorCode) { -- return GoogleApiAvailability.getInstance().getErrorString(errorCode); -+ return ""; - } - } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java -@@ -10,8 +10,6 @@ import android.content.Context; - import android.content.DialogInterface; - import android.support.annotation.IntDef; - --import com.google.android.gms.common.GoogleApiAvailability; -- - import org.chromium.base.ThreadUtils; - import org.chromium.base.metrics.CachedMetrics.ActionEvent; - import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample; -@@ -120,7 +118,6 @@ public abstract class UserRecoverableErrorHandler { - sErrorHandlerActionHistogramSample.record(ErrorHandlerAction.IGNORED_AS_REDUNDANT); - return; - } -- GoogleApiAvailability.getInstance().showErrorNotification(context, errorCode); - sErrorHandlerActionHistogramSample.record(ErrorHandlerAction.SYSTEM_NOTIFICATION); - } - } -@@ -213,13 +210,6 @@ public abstract class UserRecoverableErrorHandler { - if (mErrorCode != errorCode) { - cancelDialog(); - } -- if (mDialog == null) { -- mDialog = GoogleApiAvailability.getInstance().getErrorDialog( -- mActivity, errorCode, NO_RESPONSE_REQUIRED); -- mErrorCode = errorCode; -- -- DialogUserActionRecorder.createAndAttachToDialog(mDialog); -- } - // This can happen if |errorCode| is ConnectionResult.SERVICE_INVALID. - if (mDialog != null && !mDialog.isShowing()) { - mDialog.setCancelable(mCancelable); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java -@@ -21,8 +21,6 @@ import android.text.TextUtils; - import android.view.View; - import android.view.animation.LinearInterpolator; - --import com.google.android.gms.common.GooglePlayServicesUtil; -- - import org.chromium.base.AsyncTask; - import org.chromium.base.CommandLine; - import org.chromium.base.Log; -@@ -163,13 +161,7 @@ public class UpdateMenuItemHelper { - } - - private static boolean isGooglePlayStoreAvailable(Context context) { -- try { -- context.getPackageManager().getPackageInfo( -- GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE, 0); -- } catch (PackageManager.NameNotFoundException e) { -- return false; -- } -- return true; -+ return false; - } - - /** -diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni ---- a/chrome/android/java_sources.gni -+++ b/chrome/android/java_sources.gni -@@ -618,10 +618,7 @@ chrome_java_sources = [ - "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java", - "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java", - "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java", -- "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java", - "java/src/org/chromium/chrome/browser/gcore/ConnectedTask.java", -- "java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java", -- "java/src/org/chromium/chrome/browser/gcore/LifecycleHook.java", - "java/src/org/chromium/chrome/browser/gsa/ContextReporter.java", - "java/src/org/chromium/chrome/browser/gsa/GSAAccountChangeListener.java", - "java/src/org/chromium/chrome/browser/gsa/GSAContextDisplaySelection.java", -diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java ---- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java -+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java -@@ -4,9 +4,6 @@ - - package org.chromium.components.signin; - --import com.google.android.gms.common.ConnectionResult; --import com.google.android.gms.common.GoogleApiAvailability; -- - import org.chromium.base.ContextUtils; - import org.chromium.base.Log; - import org.chromium.base.StrictModeContext; -@@ -47,12 +44,7 @@ public class AccountIdProvider { - * Google Play services is available. - */ - public boolean canBeUsed() { -- // TODO(http://crbug.com/577190): Remove StrictMode override. -- try (StrictModeContext unused = StrictModeContext.allowDiskWrites()) { -- int resultCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable( -- ContextUtils.getApplicationContext()); -- return resultCode == ConnectionResult.SUCCESS; -- } -+ return false; - } - - /** -diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java ---- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java -+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java -@@ -4,8 +4,6 @@ - - package org.chromium.components.signin; - --import com.google.android.gms.common.GoogleApiAvailability; -- - /** - * This class encapsulates return code if GMSCore package is not available. - */ -@@ -27,6 +25,6 @@ public class GmsAvailabilityException extends AccountManagerDelegateException { - } - - public boolean isUserResolvableError() { -- return GoogleApiAvailability.getInstance().isUserResolvableError(mResultCode); -+ return false; - } - } -diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java ---- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -@@ -24,9 +24,6 @@ import android.os.PatternMatcher; - import android.os.Process; - import android.os.SystemClock; - --import com.google.android.gms.common.ConnectionResult; --import com.google.android.gms.common.GoogleApiAvailability; -- - import org.chromium.base.ApiCompatibilityUtils; - import org.chromium.base.Callback; - import org.chromium.base.ContextUtils; -@@ -83,17 +80,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - } - - protected void checkCanUseGooglePlayServices() throws AccountManagerDelegateException { -- Context context = ContextUtils.getApplicationContext(); -- final int resultCode = -- GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context); -- if (resultCode == ConnectionResult.SUCCESS) { -- return; -- } -- -- throw new GmsAvailabilityException( -- String.format("Can't use Google Play Services: %s", -- GoogleApiAvailability.getInstance().getErrorString(resultCode)), -- resultCode); -+ throw new GmsAvailabilityException("Can't use Google Play Services: CFOSS",0); - } - - @Override -@@ -210,8 +197,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - callback.onResult(null); - } - }; -- mAccountManager.addAccount(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE, null, null, null, null, -+ /*mAccountManager.addAccount(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE, null, null, null, null, - accountManagerCallback, null); -+ */ - } - - // No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs -diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java ---- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java -+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java -@@ -4,9 +4,6 @@ - - package org.chromium.shape_detection; - --import com.google.android.gms.common.ConnectionResult; --import com.google.android.gms.common.GoogleApiAvailability; -- - import org.chromium.base.ContextUtils; - import org.chromium.mojo.bindings.InterfaceRequest; - import org.chromium.mojo.system.MojoException; -@@ -24,10 +21,7 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider { - @Override - public void createFaceDetection( - InterfaceRequest request, FaceDetectorOptions options) { -- final boolean isGmsCoreSupported = -- GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable( -- ContextUtils.getApplicationContext()) -- == ConnectionResult.SUCCESS; -+ final boolean isGmsCoreSupported = false; - - if (isGmsCoreSupported) { - //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request); --- -2.11.0 - diff --git a/patches/BRM094_Allow-sign-in-to-Google-sites-like-Gmail-without-signing-in-to-Chromium.patch b/patches/BRM092_Allow-sign-in-to-Google-sites-like-Gmail-without-signing-in-to-Chromium.patch similarity index 100% rename from patches/BRM094_Allow-sign-in-to-Google-sites-like-Gmail-without-signing-in-to-Chromium.patch rename to patches/BRM092_Allow-sign-in-to-Google-sites-like-Gmail-without-signing-in-to-Chromium.patch diff --git a/patches/BRM095_Permanently-disable-query-in-omnibox.patch b/patches/BRM093_Permanently-disable-query-in-omnibox.patch similarity index 100% rename from patches/BRM095_Permanently-disable-query-in-omnibox.patch rename to patches/BRM093_Permanently-disable-query-in-omnibox.patch diff --git a/patches/BRM096_Offer-builtin-autocomplete-for-chrome-flags.patch b/patches/BRM094_Offer-builtin-autocomplete-for-chrome-flags.patch similarity index 100% rename from patches/BRM096_Offer-builtin-autocomplete-for-chrome-flags.patch rename to patches/BRM094_Offer-builtin-autocomplete-for-chrome-flags.patch diff --git a/patches/BRM097_Enable-history-requirement-of-user-gesture.patch b/patches/BRM095_Enable-history-requirement-of-user-gesture.patch similarity index 100% rename from patches/BRM097_Enable-history-requirement-of-user-gesture.patch rename to patches/BRM095_Enable-history-requirement-of-user-gesture.patch diff --git a/patches/BRM098_Enable-serialization-of-scroll-position-changes-while-loading.patch b/patches/BRM096_Enable-serialization-of-scroll-position-changes-while-loading.patch similarity index 100% rename from patches/BRM098_Enable-serialization-of-scroll-position-changes-while-loading.patch rename to patches/BRM096_Enable-serialization-of-scroll-position-changes-while-loading.patch diff --git a/patches/BRM099_Remove-passwords-keyboard-accessory-option.patch b/patches/BRM097_Remove-passwords-keyboard-accessory-option.patch similarity index 100% rename from patches/BRM099_Remove-passwords-keyboard-accessory-option.patch rename to patches/BRM097_Remove-passwords-keyboard-accessory-option.patch diff --git a/patches/BRM103_Enable-TLS-1.3-final-by-default.patch b/patches/BRM098_Enable-TLS-1.3-final-by-default.patch similarity index 100% rename from patches/BRM103_Enable-TLS-1.3-final-by-default.patch rename to patches/BRM098_Enable-TLS-1.3-final-by-default.patch