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

Commit 1a0ca1a6 authored by Kenny Guy's avatar Kenny Guy Committed by android-build-merger
Browse files

Merge "Merge intent filters so intent forwarding works." into oc-dev am: dc43b64c 

am: 6f802c0a

Change-Id: Ib0957812744aea02e9d4710c39ff3a7d300b0976
parents 1a12804a 6f802c0a

AndroidManifest.xml

+1 −4
Original line number Diff line number Diff line
@@ -2558,6 +2558,7 @@ 
            <intent-filter android:priority="1">

                <action android:name="com.android.settings.SOUND_SETTINGS" />

                <action android:name="android.settings.SOUND_SETTINGS" />

                <action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>
@@ -2566,10 +2567,6 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="6">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>