PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify the value of intent-filter" into sc-dev am: ba3bf73e86

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13640540

Change-Id: I0e90eadbae48e59419ebdc8ba8c7972d851da837
This commit is contained in:
Chiachang Wang
2021-03-19 10:47:38 +00:00
committed by Automerger Merge Worker
parent 12496ec5b5 ba3bf73e86
commit 9806f2b3b8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

@@ -397,12 +397,15 @@
android:exported="true"
android:permission="android.permission.NETWORK_STACK"
android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
<!-- TODO: Consider removing below two intent filters.
It seems like below two intent filters can be removed because when the notification
is clicked, this activity will be launched anyway. -->
<intent-filter>
<action android:name="android.net.conn.PROMPT_UNVALIDATED" />
<action android:name="android.net.action.PROMPT_UNVALIDATED" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.net.conn.PROMPT_LOST_VALIDATION" />
<action android:name="android.net.action.PROMPT_LOST_VALIDATION" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"