commit f9f279ef9cb833a4ee32c1c68993a1935ee155a4
author Kenny Guy <kennyguy@google.com> Tue Apr 04 18:01:13 2017 +0100
committer Kenny Guy <kennyguy@google.com> Tue Apr 04 18:15:59 2017 +0000
tree 039ca361be7f36961f273df6344ab735c4fa152b
parent c8e06b3fb6f09d92a9e101744f7ef4f688248ea2

Merge intent filters so intent forwarding works.

Settings forwards intent filters from work to
personal profile based on intent filter returned
from resolving activities.

Test: CTSVerifier, Open BYOD Managed Provisioning test, Click on "Cross profile intent filters are set " test.
Bug: 36275359
Change-Id: I83b7112c4a00a08f0af2be59669a073691fbda0b

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>