From a15991825fdc61f3a7ff15bd83f74c6769415e82 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Wed, 1 Jul 2020 14:25:00 +0000
Subject: [PATCH] Revert "Merge branch 'fix-oreo-network-control-option' into
 'v1-oreo'"

This reverts merge request !30
---
 app/src/main/AndroidManifest.xml | 60 +++++++++++++-------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d1e0f00..230864b5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,21 +7,20 @@ http://www.gnu.org/licenses/gpl.html
 -->
 <!-- @author Vincent Bourgmayer -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="foundation.e.drive">
+    package="foundation.e.drive"
+    android:sharedUserId="android.uid.system" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- needed for PersistedJob -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <!-- needed for PersistedJob -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
-
-    <permission
-        android:name="android.permission.FORCE_STOP_PACKAGES"
+    <permission android:name="android.permission.FORCE_STOP_PACKAGES"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature"/>
 
     <application
         android:allowBackup="true"
@@ -30,64 +29,55 @@ http://www.gnu.org/licenses/gpl.html
         android:roundIcon="@mipmap/ic_eelo_round">
         <!-- Providers -->
         <provider
-            android:name=".providers.MediasSyncProvider"
             android:authorities="foundation.e.drive.providers.MediasSyncProvider"
+            android:name=".providers.MediasSyncProvider"
+            android:label="Pictures and videos"
             android:enabled="true"
-            android:exported="true"
-            android:label="Pictures and videos" />
+            android:exported="true"/>
         <provider
-            android:name=".providers.SettingsSyncProvider"
             android:authorities="foundation.e.drive.providers.SettingsSyncProvider"
+            android:name=".providers.SettingsSyncProvider"
+            android:label="Application settings"
             android:enabled="true"
-            android:exported="true"
-            android:label="Application settings" />
+            android:exported="true"/>
 
         <!-- Services -->
-        <service
-            android:name=".services.InitializerService"
+        <service android:name=".services.InitializerService"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
                 <action android:name="drive.services.InitializerService" />
             </intent-filter>
         </service>
-        <service
-            android:name=".services.ResetService"
+        <service android:name=".services.ResetService"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
                 <action android:name="drive.services.ResetService" />
             </intent-filter>
         </service>
-        <service
-            android:name=".jobs.ScannerJob"
+        <service android:name=".jobs.ScannerJob"
             android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".services.ObserverService"
-            android:enabled="true" />
-        <service android:name=".services.OperationManagerService" />
+        <service android:name=".services.ObserverService"
+            android:enabled="true"/>
+        <service android:name=".services.OperationManagerService"/>
 
         <!-- Receivers -->
-        <receiver
-            android:name=".receivers.BootCompleteReceiver"
+        <receiver android:name=".receivers.BootCompleteReceiver"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <receiver
-            android:name=".receivers.BatteryStateReceiver"
-            android:enabled="true">
+        <receiver android:name=".receivers.BatteryStateReceiver" android:enabled="true">
             <intent-filter>
-                <action android:name="android.intent.action.BATTERY_LOW" />
-                <action android:name="android.intent.action.BATTERY_OKAY" />
+                <action android:name="android.intent.action.BATTERY_LOW"/>
+                <action android:name="android.intent.action.BATTERY_OKAY"/>
             </intent-filter>
         </receiver>
-        <receiver
-            android:name=".receivers.PackageEventReceiver"
-            android:enabled="true">
+        <receiver android:name=".receivers.PackageEventReceiver" android:enabled="true">
             <intent-filter>
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
             </intent-filter>
         </receiver>
     </application>
-- 
GitLab