Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53fa1426 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modify the value of intent-filter" am: 15ecc361 am: e7ff2152 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: If539b29f4ebdcdac637fb8ff61e1752de5af5cd2
parents aef00cff e7ff2152

AndroidManifest.xml

+5 −2
Original line number Diff line number Diff line
@@ -376,12 +376,15 @@ 
                  android:exported="true"

                  android:permission="android.permission.NETWORK_STACK"

                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">

            <!-- 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"