Merge branch 'develop' into ready/removeJacoco
This commit is contained in:
commit
5f31eaaffe
|
@ -1,5 +1,5 @@
|
|||
ext.versions = [
|
||||
minSdk : 21,
|
||||
targetSdk : 30,
|
||||
targetSdk : 31,
|
||||
compileSdk : 31,
|
||||
]
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
<application
|
||||
android:allowBackup="false"
|
||||
android:fullBackupContent="@xml/backup_descriptor"
|
||||
android:dataExtractionRules="@xml/backup_rules"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:theme="@style/NoActionBar"
|
||||
|
@ -40,7 +42,8 @@
|
|||
|
||||
<activity android:name=".activity.NavigationActivity"
|
||||
android:configChanges="orientation|keyboardHidden"
|
||||
android:launchMode="singleTask">
|
||||
android:launchMode="singleTask"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<action android:name="android.intent.action.SEARCH"/>
|
||||
|
@ -61,7 +64,7 @@
|
|||
android:exported="false">
|
||||
</service>
|
||||
|
||||
<!-- TODO: Check if it works with exported=false as well -->
|
||||
<!-- Needs to be exported: https://android.googlesource.com/platform/developers/build/+/4de32d4/prebuilts/gradle/MediaBrowserService/README.md -->
|
||||
<service android:name=".playback.PlaybackService"
|
||||
android:label="@string/common.appname"
|
||||
android:exported="true">
|
||||
|
@ -150,7 +153,8 @@
|
|||
</receiver>
|
||||
<provider
|
||||
android:name=".provider.SearchSuggestionProvider"
|
||||
android:authorities="org.moire.ultrasonic.provider.SearchSuggestionProvider"/>
|
||||
android:authorities="org.moire.ultrasonic.provider.SearchSuggestionProvider"
|
||||
android:exported="true" />
|
||||
|
||||
</application>
|
||||
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Targeting Android 11 or lower -->
|
||||
<full-backup-content>
|
||||
<!-- The following "exclude" elements are not part of the auto backup -->
|
||||
<!--exclude domain="database" path="name.db" /-->
|
||||
<exclude domain="root"/>
|
||||
<!-- Exclude specific shared preferences that contain GCM registration Id -->
|
||||
|
||||
<!-- The following "include" elements are part of the auto backup -->
|
||||
<include domain="sharedpref" path="."/>
|
||||
<include domain="database" path="."/>
|
||||
</full-backup-content>
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Targeting Android 12 or higher -->
|
||||
<data-extraction-rules>
|
||||
<cloud-backup disableIfNoEncryptionCapabilities="true">
|
||||
<!--include domain=["file" | "database" | "sharedpref" | "external" | "root"] path="string"/-->
|
||||
<!--exclude domain=["file" | "database" | "sharedpref" | "external" | "root"] path="string"/-->
|
||||
<exclude domain="root"/>
|
||||
<include domain="sharedpref" path="."/>
|
||||
<include domain="database" path="."/>
|
||||
</cloud-backup>
|
||||
<device-transfer>
|
||||
<!-- Specifying nothing here means: Include all: https://developer.android.com/guide/topics/data/autobackup#include-exclude-android-11 -->
|
||||
</device-transfer>
|
||||
</data-extraction-rules>
|
Loading…
Reference in New Issue