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

Commit 9806f2b3 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I0e90eadbae48e59419ebdc8ba8c7972d851da837
parents 12496ec5 ba3bf73e

AndroidManifest.xml

+5 −2
Original line number Diff line number Diff line
@@ -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"