diff options
| author | Albin <albin@mullvad.net> | 2022-09-03 14:34:07 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-09-03 14:34:07 +0200 |
| commit | 665ef258c71c8c4fd6e0213e17ec5cadd76684f4 (patch) | |
| tree | b5e8642b6d935061e53f5967e5740d004aae2146 | |
| parent | f5929efafee477ac8fbaaac5f201bc57e05f953c (diff) | |
| parent | 73343d5c4cf18aa3d48c0cdab6c828d9a683b955 (diff) | |
| download | mullvadvpn-665ef258c71c8c4fd6e0213e17ec5cadd76684f4.tar.xz mullvadvpn-665ef258c71c8c4fd6e0213e17ec5cadd76684f4.zip | |
Merge branch 'explicitly-export-activity-and-services'
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2cb2809891..59d85b30d4 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -24,7 +24,12 @@ android:banner="@drawable/banner" android:name=".MullvadApplication" tools:ignore="GoogleAppIndexingWarning"> + <!-- + MainActivity + Must be exported in order to be launchable. + --> <activity android:name="net.mullvad.mullvadvpn.ui.MainActivity" + android:exported="true" android:label="@string/app_name" android:launchMode="singleTask" android:configChanges="orientation|screenSize|screenLayout" @@ -39,7 +44,14 @@ <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" /> </intent-filter> </activity> + <!-- + MullvadVpnService + It's unclear in the documentation whether the service must/should be exported or not, + however as it's protected by the bind vpn permission + (android.permission.BIND_VPN_SERVICE) it's protected against third party apps/services. + --> <service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService" + android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE" android:process=":mullvadvpn_daemon" android:stopWithTask="false"> @@ -56,10 +68,16 @@ <action android:name="net.mullvad.mullvadvpn.quit_action" /> </intent-filter> </service> + <!-- + MullvadTileService + Tile services must be exported and protected by the bind tile permission + (android.permission.BIND_QUICK_SETTINGS_TILE). + --> <service android:name="net.mullvad.mullvadvpn.service.MullvadTileService" + android:exported="true" + android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" android:label="@string/toggle_vpn" android:icon="@drawable/small_logo_black" - android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" android:process=":mullvadvpn_tile"> <intent-filter> <action android:name="android.service.quicksettings.action.QS_TILE" /> |