Updated patches after rebase on master.

brave · Jun 30, 2020 · 2526e2c · 2526e2c
1 parent 107d3a0
commit 2526e2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index a38b5b4de3a0c0a4cfe3420e2c6441dc4f8c6f84..4f647fd3e7fd0c3d1f47fb81fa4fb743e0615230 100644
+index a38b5b4de3a0c0a4cfe3420e2c6441dc4f8c6f84..df0652285aaeb539327101d924ce128f9d007ce4 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@

diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 8c264ba98b6af8e5921dbda61a76658040b6935c..062bc6a74940bd118237ce1c8a945cd299ce2165 100644
+index 8c264ba98b6af8e5921dbda61a76658040b6935c..7240a4e756a7b99bfe401f711f6b2cd39078883d 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -34,7 +34,9 @@ by a child template that "extends" this file.

diff --git a/...-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/...-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-index 4a7c610cec562ed067a86629b8a6f5d0b8758ddf..cb5b05a4baadffd0c09e750d4b89925d06bd5266 100644
+index bf9fefaa55ccc4b0b48717bb2961aa9904a37e4c..a2d225c2993ed906799ad1fafa31ef628a9099a6 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 @@ -24,7 +24,7 @@ import androidx.appcompat.app.AlertDialog;
@@ -11,10 +11,10 @@ index 4a7c610cec562ed067a86629b8a6f5d0b8758ddf..cb5b05a4baadffd0c09e750d4b89925d
  import androidx.preference.Preference;
  import androidx.preference.PreferenceCategory;
  import androidx.preference.PreferenceFragmentCompat;
-@@ -312,7 +312,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
-     private void updateSyncPreferences() {
+@@ -313,7 +313,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
          String signedInAccountName = CoreAccountInfo.getEmailFrom(
-                 IdentityServicesProvider.get().getIdentityManager().getPrimaryAccountInfo());
+                 IdentityServicesProvider.get().getIdentityManager().getPrimaryAccountInfo(
+                         ConsentLevel.SYNC));
 -        if (signedInAccountName == null) {
 +        if (false) {
              // May happen if account is removed from the device while this screen is shown.

diff --git a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
-index f435e762221dad768067cee580bc3920c4dfa045..113894b95fa6bcbdd77ddb398a66971a51ad3a34 100644
+index f435e762221dad768067cee580bc3920c4dfa045..5010e8ca889de8b3d7db6901037058f66498b9b5 100644
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 @@ -308,10 +308,12 @@ bool AutoplayPolicy::IsGestureNeededForPlayback() const {