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

Commit dc43b64c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 30ce1bee f9f279ef

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>