diff options
| author | Allan Wang <me@allanwang.ca> | 2021-11-18 14:32:08 -0800 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2021-11-18 14:32:08 -0800 |
| commit | 5662e6f483b93a07f01c352786462406e4d54f4f (patch) | |
| tree | 105200d606ab7b5fe928f557976e214092a04212 /app/src/main/AndroidManifest.xml | |
| parent | 68397505810095136cac25382d93ca9b910d38c9 (diff) | |
| parent | ab7447c811808568cc7367eef3149aead2d990b3 (diff) | |
| download | frost-5662e6f483b93a07f01c352786462406e4d54f4f.tar.gz frost-5662e6f483b93a07f01c352786462406e4d54f4f.tar.bz2 frost-5662e6f483b93a07f01c352786462406e4d54f4f.zip | |
Fix merge conflicts
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 62cf57e9..dfdc9706 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ <activity android:name=".StartActivity" - android:label="@string/frost_name" + android:exported="true" android:noHistory="true" android:theme="@style/FrostTheme.Splash"> <intent-filter> @@ -174,14 +174,17 @@ <receiver android:name=".services.UpdateReceiver" - android:enabled="true"> + android:enabled="true" + android:exported="false"> <intent-filter> <action android:name="android.intent.action.MY_PACKAGE_REPLACED" /> </intent-filter> </receiver> <!--Widgets--> - <receiver android:name=".widgets.NotificationWidget"> + <receiver + android:name=".widgets.NotificationWidget" + android:exported="false"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> |