commit dc43b64c54341722a3f920acb14fb9f6eec9d123
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 04 21:25:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 21:25:17 2017 +0000
tree c4af1028c52b4b4c121fd7257606ac948b033f06
parent 30ce1bee208f02639fdc21983efca56443d9156a
parent f9f279ef9cb833a4ee32c1c68993a1935ee155a4

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 543c90b..da88f76 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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>