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

Unverified Commit c4bce0f4 authored by csagan5's avatar csagan5
Browse files

Updated patches for latest release

parent cf3313d1

build/patches/Remove-all-sync-and-account-permissions-features-from-manifest.patch→build/patches/Disable-sync-adaptive-service-from-manifest.patch

+72 −0
Original line number Diff line number Diff line 
From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sun, 14 Apr 2019 12:08:27 +0200

Subject: Remove all sync and account permissions/features from manifest

Subject: Disable sync adaptive service from manifest



Prevents authorization prompt for Play services on reboot

---

 chrome/android/java/AndroidManifest.xml | 48 ---------------------------------

 1 file changed, 48 deletions(-)

 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

@@ -43,17 +43,13 @@ by a child template that "extends" this file.

     {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}

         <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

     {% endif %}

-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>

     <uses-permission android:name="android.permission.INTERNET"/>

-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>

     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

     {% if target_sdk_version|int > 28 or target_sdk_version == "Q" %}

         <uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_IMAGES"/>

     {% endif %}

     <uses-permission android:name="android.permission.NFC"/>

     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>

-    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>

     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

     <uses-permission android:name="android.permission.RECORD_AUDIO"/>

     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>

@@ -61,7 +57,6 @@ by a child template that "extends" this file.

     <uses-permission android:name="android.permission.VIBRATE"/>

     <uses-permission android:name="android.permission.WAKE_LOCK"/>

     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>

     {% set enable_vr = enable_vr|default(0) %}

     {% if enable_vr == "true" %}

     <!-- Indicates use of Android's VR-mode, available only on Android N+. -->

@@ -94,8 +89,6 @@ by a child template that "extends" this file.

     <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>

     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

 

-    <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />

-

     {% block extra_uses_permissions %}

     {% endblock %}

 

@@ -555,10 +548,6 @@ by a child template that "extends" this file.

         </activity>

         {% endif %}

 

-        <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"

-            android:theme="@style/Theme.Chromium.Activity"

-            android:autoRemoveFromRecents="true">

-        </activity>

         <activity android:name="org.chromium.chrome.browser.firstrun.LightweightFirstRunActivity"

             android:theme="@style/Theme.Chromium.AlertDialog.NoActionBar"

             {{ self.first_run_activity_common() }}>

@@ -589,15 +578,6 @@ by a child template that "extends" this file.

             {{ self.supports_vr() }}

         </activity>

         {% endif %}

-        <activity android:name="org.chromium.chrome.browser.signin.AccountSigninActivity"

-            android:theme="@style/Theme.Chromium.DialogWhenLarge"

-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize">

-        </activity>

-        <activity android:name="org.chromium.chrome.browser.signin.SigninActivity"

-            android:theme="@style/Theme.Chromium.DialogWhenLarge"

-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"

-            android:exported="false">

-        </activity>

         <activity android:name="org.chromium.chrome.browser.preferences.Preferences"

             android:theme="@style/Theme.Chromium.Preferences"

             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"

@@ -919,23 +899,6 @@ by a child template that "extends" this file.

@@ -919,16 +919,6 @@ by a child template that "extends" this file.

                 android:resource="@xml/file_paths" />

         </provider>
@@ -85,17 +46,10 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro 
-                       android:resource="@xml/syncadapter" />

-        </service>

-

-        <!-- Broadcast receiver that will be notified of account changes -->

-        <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">

-            <intent-filter>

-                <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />

-            </intent-filter>

-        </receiver>

-

         <!-- Download foreground service -->

         <service android:name="org.chromium.chrome.browser.download.DownloadForegroundService"

             android:exported="false">

@@ -997,17 +960,6 @@ by a child template that "extends" this file.

         <!-- Broadcast receiver that will be notified of account changes -->

         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">

             <intent-filter>

@@ -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" />

build/patches_list.txt

+1 −1
Original line number Diff line number Diff line
@@ -111,4 +111,4 @@ Enable-site-per-process-isolation-for-devices-with-enough-memory.patch 
Use-64-bit-WebView-processes.patch

Add-option-to-use-home-page-as-NTP.patch

Enable-night-mode-menu-entry-by-default.patch

Remove-all-sync-and-account-permissions-features-from-manifest.patch
 
Disable-sync-adaptive-service-from-manifest.patch