[AUTO] Patches auto-rebase for next-139 branch (#2266)

[AUTO] Patches auto-rebase for next-139 branch
This commit is contained in:
uazo
2025-08-13 13:26:25 -01:00
committed by GitHub
2 changed files with 6 additions and 6 deletions
@@ -658,7 +658,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.h b/co
diff --git a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java
--- a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java
+++ b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java
@@ -57,6 +57,7 @@ public class AutofillManagerWrapper {
@@ -58,6 +58,7 @@ public class AutofillManagerWrapper {
AutofillManagerWrapper manager = mManager.get();
if (manager == null) return;
manager.mIsAutofillInputUiShowing = (event == EVENT_INPUT_SHOWN);
@@ -666,7 +666,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component
if (event == EVENT_INPUT_SHOWN) manager.notifyInputUiChange();
}
}
@@ -124,6 +125,7 @@ public class AutofillManagerWrapper {
@@ -125,6 +126,7 @@ public class AutofillManagerWrapper {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
ComponentName componentName = getAutofillServiceComponentName(autofillManager);
@@ -674,16 +674,16 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component
if (componentName != null) {
mPackageName = componentName.getPackageName();
mIsAwGCurrentAutofillService =
@@ -345,7 +347,7 @@ public class AutofillManagerWrapper {
@@ -346,7 +348,7 @@ public class AutofillManagerWrapper {
/** Always check isLoggable() before call this method. */
public static void log(String log) {
// Log.i() instead of Log.d() is used here because log.d() is stripped out in release build.
// Log.i() instead of Log.d() is used here because Log.d() is stripped out in release build.
- Log.i(TAG, log);
+ Log.i(TAG, "---" + log);
}
public static boolean isLoggable() {
@@ -358,5 +360,6 @@ public class AutofillManagerWrapper {
@@ -360,5 +362,6 @@ public class AutofillManagerWrapper {
// NOTE: See the comment on TAG above for why this is still AwAutofillManager.
// Check the system setting directly.
sIsLoggable = android.util.Log.isLoggable(TAG, Log.DEBUG);
@@ -3956,7 +3956,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -3716,10 +3716,6 @@ if (is_android) {
@@ -3717,10 +3717,6 @@ if (is_android) {
testonly = true
sources = content_java_sources_needing_jni
deps = [