From c4bce0f44999754554beb93e0716e364f7e0ea07 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 15 Apr 2019 08:38:09 +0200
Subject: [PATCH] Updated patches for latest release
---
...-sync-adaptive-service-from-manifest.patch | 72 +++++++++++
...t-permissions-features-from-manifest.patch | 118 ------------------
build/patches_list.txt | 2 +-
3 files changed, 73 insertions(+), 119 deletions(-)
create mode 100644 build/patches/Disable-sync-adaptive-service-from-manifest.patch
delete mode 100644 build/patches/Remove-all-sync-and-account-permissions-features-from-manifest.patch
diff --git a/build/patches/Disable-sync-adaptive-service-from-manifest.patch b/build/patches/Disable-sync-adaptive-service-from-manifest.patch
new file mode 100644
index 00000000..4923b233
--- /dev/null
+++ b/build/patches/Disable-sync-adaptive-service-from-manifest.patch
@@ -0,0 +1,72 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 14 Apr 2019 12:08:27 +0200
+Subject: Disable sync adaptive service from manifest
+
+Prevents authorization prompt for Play services on reboot
+---
+ chrome/android/BUILD.gn | 4 +---
+ chrome/android/java/AndroidManifest.xml | 21 ---------------------
+ 2 files changed, 1 insertion(+), 24 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -1022,8 +1022,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+ resources = [
+ "java/res_template/xml/file_paths.xml",
+ "java/res_template/xml/launchershortcuts.xml",
+- "java/res_template/xml/searchable.xml",
+- "java/res_template/xml/syncadapter.xml",
++ "java/res_template/xml/searchable.xml"
+ ]
+ res_dir = "java/res_template"
+ variables = [ "manifest_package=$manifest_package" ]
+@@ -1034,7 +1033,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
+ "java/res_template/xml/file_paths.xml",
+ "java/res_template/xml/launchershortcuts.xml",
+ "java/res_template/xml/searchable.xml",
+- "java/res_template/xml/syncadapter.xml",
+ ]
+ res_dir = "java/res_template"
+
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
++++ b/chrome/android/java/AndroidManifest.xml
+@@ -919,16 +919,6 @@ by a child template that "extends" this file.
+ android:resource="@xml/file_paths" />
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -997,17 +987,6 @@ by a child template that "extends" this file.
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
+ android:hardwareAccelerated="false" />
+
+-
+-
+-
+-
+-
+-
+-
+-
+
+
-Date: Sun, 14 Apr 2019 12:08:27 +0200
-Subject: Remove all sync and account permissions/features from manifest
-
----
- chrome/android/java/AndroidManifest.xml | 48 ---------------------------------
- 1 file changed, 48 deletions(-)
-
-diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
---- a/chrome/android/java/AndroidManifest.xml
-+++ b/chrome/android/java/AndroidManifest.xml
-@@ -43,17 +43,13 @@ by a child template that "extends" this file.
- {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
-
- {% endif %}
--
-
--
-
- {% if target_sdk_version|int > 28 or target_sdk_version == "Q" %}
-
- {% endif %}
-
-
--
--
-
-
-
-@@ -61,7 +57,6 @@ by a child template that "extends" this file.
-
-
-
--
- {% set enable_vr = enable_vr|default(0) %}
- {% if enable_vr == "true" %}
-
-@@ -94,8 +89,6 @@ by a child template that "extends" this file.
-
-
-
--
--
- {% block extra_uses_permissions %}
- {% endblock %}
-
-@@ -555,10 +548,6 @@ by a child template that "extends" this file.
-
- {% endif %}
-
--
--
-
-@@ -589,15 +578,6 @@ by a child template that "extends" this file.
- {{ self.supports_vr() }}
-
- {% endif %}
--
--
--
--
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-
-@@ -997,17 +960,6 @@ by a child template that "extends" this file.
- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
- android:hardwareAccelerated="false" />
-
--
--
--
--
--
--
--
--
-
-