Skip to content

Commit

Permalink
Update/port to 118.0.5993.111
Browse files Browse the repository at this point in the history
  • Loading branch information
vanadium-staging authored and thestinger committed Oct 24, 2023
1 parent 1b6fece commit cbf51a2
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 67 deletions.
4 changes: 2 additions & 2 deletions args.gn
Expand Up @@ -3,8 +3,8 @@ target_os = "android"
target_cpu = "arm64"

android_channel = "stable"
android_default_version_name = "118.0.5993.80"
android_default_version_code = "599308000"
android_default_version_name = "118.0.5993.111"
android_default_version_code = "599311100"

ext_version_enabled = true
ext_version_increment = "0"
Expand Down
2 changes: 1 addition & 1 deletion patches/0001-disable-checkout_nacl.patch
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index df0ac1f3c3dbb..e55537f7fb94b 100644
index 5e91cf388ad51..8c318ad6bf399 100644
--- a/DEPS
+++ b/DEPS
@@ -123,7 +123,7 @@ vars = {
Expand Down
118 changes: 59 additions & 59 deletions patches/0009-Vanadium-string-rebranding.patch

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/0041-enable-split-cache-by-default.patch
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] enable split cache by default
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/base/features.cc b/net/base/features.cc
index 70f79c1d3a0f1..d36e158a42876 100644
index 1745b75fcc07c..bb0cd6d8eb6c4 100644
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -106,11 +106,11 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials,
Expand Down
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] enable partitioning connections by default
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/base/features.cc b/net/base/features.cc
index d36e158a42876..f724ce3eb7e8b 100644
index bb0cd6d8eb6c4..3d71b82eeabee 100644
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -114,27 +114,27 @@ BASE_FEATURE(kSplitCodeCacheByNetworkIsolationKey,
Expand Down
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] enable new third party storage partitioning
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/base/features.cc b/net/base/features.cc
index f724ce3eb7e8b..488c9153ab6e7 100644
index 3d71b82eeabee..37bde18a096bc 100644
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -275,7 +275,7 @@ BASE_FEATURE(kCookieDomainRejectNonASCII,
Expand Down
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] Disable Play services dependent password manager feature by
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/password_manager/core/common/password_manager_features.cc b/components/password_manager/core/common/password_manager_features.cc
index 9b87b3b8a9632..59a96fa8a6d56 100644
index 89e84ea1bd9e0..baf0d86e1516e 100644
--- a/components/password_manager/core/common/password_manager_features.cc
+++ b/components/password_manager/core/common/password_manager_features.cc
@@ -136,7 +136,7 @@ BASE_FEATURE(kPasswordSuggestionBottomSheetV2,
@@ -128,7 +128,7 @@ BASE_FEATURE(kPasswordSuggestionBottomSheetV2,
// database will be unused but kept in sync for local passwords.
BASE_FEATURE(kUnifiedPasswordManagerAndroid,
"UnifiedPasswordManagerAndroid_LAUNCHED",
Expand Down
@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: fgei <fgei@gmail.com>
Date: Wed, 18 Oct 2023 09:48:14 +0000
Subject: [PATCH] Use GrapheneOS connectivity check as well for Help and
Feedback menu

---
.../chromium/chrome/browser/feedback/ConnectivityChecker.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
index ee640e582ac20..6b35c8a0df5be 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
@@ -33,9 +33,9 @@ public final class ConnectivityChecker {
private static final String TAG = "feedback";

private static final String DEFAULT_HTTP_NO_CONTENT_URL =
- "http://clients4.google.com/generate_204";
+ "http://connectivitycheck.grapheneos.network/generate_204";
private static final String DEFAULT_HTTPS_NO_CONTENT_URL =
- "https://clients4.google.com/generate_204";
+ "https://connectivitycheck.grapheneos.network/generate_204";

private static String sHttpNoContentUrl = DEFAULT_HTTP_NO_CONTENT_URL;
private static String sHttpsNoContentUrl = DEFAULT_HTTPS_NO_CONTENT_URL;

0 comments on commit cbf51a2

Please sign in to comment.