diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-28 09:47:45 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-28 09:47:45 -0300 |
| commit | c06f91c47421dd48edee8c078d1ba3033e59aacd (patch) | |
| tree | 4cac317c9d58a7c91fd33bda294bc9cce17039d0 /android/src | |
| parent | 04c18f26297332b529b919ff19170605ff96cbdc (diff) | |
| parent | 0853538b790afb1bd8abf08d54696c43a9cf7023 (diff) | |
| download | mullvadvpn-c06f91c47421dd48edee8c078d1ba3033e59aacd.tar.xz mullvadvpn-c06f91c47421dd48edee8c078d1ba3033e59aacd.zip | |
Merge branch 'format-manifest-xml'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/AndroidManifest.xml | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index ca8178220b..8b55f36bf5 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,42 +1,31 @@ -<manifest - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="net.mullvad.mullvadvpn" - > +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + package="net.mullvad.mullvadvpn"> <permission android:name="net.mullvad.mullvadvpn.permission.TUNNEL_ACTION" - android:protectionLevel="signature" - /> - + android:protectionLevel="signature" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="net.mullvad.mullvadvpn.permission.TUNNEL_ACTION" /> - - <application - android:label="@string/app_name" - android:icon="@mipmap/ic_launcher" - android:roundIcon="@mipmap/ic_launcher" - android:theme="@style/AppTheme" - android:allowBackup="false" - tools:ignore="GoogleAppIndexingWarning" - > - <activity - android:name="net.mullvad.mullvadvpn.ui.MainActivity" - android:label="@string/app_name" - android:configChanges="orientation" - android:screenOrientation="portrait" - android:windowSoftInputMode="adjustPan" - > + <application android:label="@string/app_name" + android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher" + android:theme="@style/AppTheme" + android:allowBackup="false" + tools:ignore="GoogleAppIndexingWarning"> + <activity android:name="net.mullvad.mullvadvpn.ui.MainActivity" + android:label="@string/app_name" + android:configChanges="orientation" + android:screenOrientation="portrait" + android:windowSoftInputMode="adjustPan"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + <service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService" + android:permission="android.permission.BIND_VPN_SERVICE"> - <service - android:name="net.mullvad.mullvadvpn.service.MullvadVpnService" - android:permission="android.permission.BIND_VPN_SERVICE" - > <intent-filter> <action android:name="android.net.VpnService" /> </intent-filter> |