diff --git a/build/patches/Restore-chrome-password-store.patch b/build/patches/Restore-chrome-password-store.patch index e276552d..4bbf7471 100644 --- a/build/patches/Restore-chrome-password-store.patch +++ b/build/patches/Restore-chrome-password-store.patch @@ -6,6 +6,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/android/java/AndroidManifest.xml | 5 ++--- .../autofill/AutofillClientProviderUtils.java | 1 + + .../AccessLossWarningMetricsRecorder.java | 1 + .../login_db_deprecation_runner_factory.cc | 2 +- .../android/strings/android_chrome_strings.grd | 2 +- .../ui/autofill/autofill_client_provider.cc | 16 ---------------- @@ -14,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../features/password_manager_features_util.cc | 1 + components/sync/service/sync_prefs.cc | 2 +- .../Restore-chrome-password-store.inc | 1 + - 10 files changed, 10 insertions(+), 23 deletions(-) + 11 files changed, 11 insertions(+), 23 deletions(-) create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml @@ -44,6 +45,17 @@ diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browse Editor editor = ContextUtils.getApplicationContext() .getSharedPreferences( +diff --git a/chrome/browser/password_manager/android/access_loss/java/src/org/chromium/chrome/browser/access_loss/AccessLossWarningMetricsRecorder.java b/chrome/browser/password_manager/android/access_loss/java/src/org/chromium/chrome/browser/access_loss/AccessLossWarningMetricsRecorder.java +--- a/chrome/browser/password_manager/android/access_loss/java/src/org/chromium/chrome/browser/access_loss/AccessLossWarningMetricsRecorder.java ++++ b/chrome/browser/password_manager/android/access_loss/java/src/org/chromium/chrome/browser/access_loss/AccessLossWarningMetricsRecorder.java +@@ -117,6 +117,7 @@ public class AccessLossWarningMetricsRecorder { + public static void logExportFlowLastStepMetric( + @PasswordAccessLossWarningType int warningType, + @PasswordAccessLossWarningExportStep int exportStep) { ++ if ((true)) return; + if (!ChromeFeatureList.isEnabled( + ChromeFeatureList + .UNIFIED_PASSWORD_MANAGER_LOCAL_PASSWORDS_ANDROID_ACCESS_LOSS_WARNING)) { diff --git a/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc b/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc --- a/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc +++ b/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc