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

Commit fbe57ef8 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'revert-ef6c2a4c' into 'v1-oreo'

Revert "fix-oreo-network-control-option"

See merge request e/apps/eDrive!31
parents ef6c2a4c a1599182
Loading
Loading
Loading
Loading
Loading
+25 −35
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 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" />
@@ -17,9 +18,7 @@ http://www.gnu.org/licenses/gpl.html
    <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"/>

@@ -30,62 +29,53 @@ 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"
        <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"/>
            </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"/>
            </intent-filter>