Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0ae84a9e authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for 145 (only line change)

parent 96b45f3e

build/patches/Add-setting-to-enable-Credman-for-passkeys.patch

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java

@@ -10,6 +10,7 @@ import android.app.Activity;

@@ -11,6 +11,7 @@ import android.app.Activity;

 import android.content.Context;

 import android.content.Intent;

 import android.net.Uri;
@@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage 
 import android.os.Bundle;

 import android.text.SpannableString;

 import android.text.style.ForegroundColorSpan;

@@ -64,6 +65,10 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;

@@ -67,6 +68,10 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;

 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;

 import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage 
 /**

  * The "Passwords" screen in Settings, which allows the user to enable or disable password saving,

  * to view saved passwords (just the username and URL), and to delete saved passwords.

@@ -322,6 +327,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment

@@ -332,6 +337,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment

         createSavePasswordsSwitch();

         createAutoSignInCheckbox();

         createEnableAndroidAutofillSwitch();
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage 
 

         PasswordManagerHandlerProvider.getForProfile(getProfile())

                 .getPasswordManagerHandler()

@@ -673,6 +679,27 @@ public class PasswordSettings extends ChromeBaseSettingsFragment

@@ -685,6 +691,27 @@ public class PasswordSettings extends ChromeBaseSettingsFragment

                 getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_AUTOSIGNIN));

     }

build/patches/Allow-building-without-supervised-users.patch

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -822,7 +822,6 @@ if (_is_default_toolchain) {

@@ -810,7 +810,6 @@ if (_is_default_toolchain) {

       "//components/offline_pages/core:offline_page_model_enums_java",

       "//components/sharing_message:sharing_dialog_type_generated_enum",

       "//components/sharing_message:sharing_send_message_result_generated_enum",

build/patches/Disable-privacy-sandbox.patch

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -1703,7 +1703,6 @@ if (_is_default_toolchain) {

@@ -1691,7 +1691,6 @@ if (_is_default_toolchain) {

   java_group("chrome_public_non_pak_assets") {

     deps = [

       "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",

build/patches/Do-not-compile-QR-code-sharing.patch

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -2868,7 +2868,6 @@ if (_is_default_toolchain) {

@@ -2856,7 +2856,6 @@ if (_is_default_toolchain) {

       "../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",

       "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",

       "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",

build/patches/Never-treat-Proguard-warnings-as-errors.patch

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Subject: Never treat Proguard warnings as errors 
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni

--- a/build/config/android/internal_rules.gni

+++ b/build/config/android/internal_rules.gni

@@ -1303,9 +1303,9 @@ if (enable_java_templates) {

@@ -1300,9 +1300,9 @@ if (enable_java_templates) {

       _source_file_template,

       "--proguard-configs=@FileArg($_rebased_build_config:proguard_all_configs)",

     ]