commit f3b2ce39278403d223fedc0d917256095595685a
author Nicolas Prevot <nprevot@google.com> Wed Aug 26 18:59:58 2015 +0100
committer Nicolas Prevot <nprevot@google.com> Thu Aug 27 10:43:37 2015 +0100
tree cda32134559a06a6df1ca15d1e6d0ede2c68dbb4
parent e23e0091687d379ab702329ba53a8bdbc3df5e72

In CtsVerifier, update the list of intents that need to be forwarded.

The list of intents that are forwarded from the work profile to the parent
has been modified. Update CtsVerifier to reflect this change.

BUG:23519274
Change-Id: I16dc148bb3d811384d2a496e2e2f961adf02acac

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 217913c..5c188b7 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1452,6 +1452,9 @@
         <activity android:name=".managedprovisioning.CrossProfileTestActivity">
             <intent-filter>
                 <action android:name="com.android.cts.verifier.managedprovisioning.CROSS_PROFILE" />
+                <!-- We need to have at least one activity listening to this intent in the parent
+                     to test if it is forwarded from the managed profile to the parent -->
+                <action android:name="android.provider.MediaStore.RECORD_SOUND" />
                 <category android:name="android.intent.category.DEFAULT"></category>
             </intent-filter>
         </activity>

apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
index 579cbcc..ff8eb60 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
@@ -133,6 +133,13 @@
                 Intent.CATEGORY_OPENABLE),
         new Intent(Intent.ACTION_OPEN_DOCUMENT).setType("*/*").addCategory(
                 Intent.CATEGORY_OPENABLE),
+        new Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS),
+        new Intent(Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS),
+        new Intent(Settings.ACTION_APPLICATION_SETTINGS),
+        new Intent("android.settings.ACTION_OTHER_SOUND_SETTINGS"),
+        new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION),
+        new Intent(Settings.ACTION_WIFI_IP_SETTINGS),
+        new Intent(Settings.ACTION_WIFI_SETTINGS),
         new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
     };
 
@@ -155,7 +162,6 @@
         new Intent(Intent.ACTION_VIEW).setData(
                 Uri.parse("http://www.example.com/horse.mp3")).setType("audio/*"),
         new Intent(MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH),
-        new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION),
         new Intent(Intent.ACTION_VIEW).setData(
                 Uri.parse("market://details?id=com.android.chrome")).addCategory(
                 Intent.CATEGORY_BROWSABLE),
@@ -163,14 +169,8 @@
         new Intent(Settings.ACTION_SEARCH_SETTINGS),
         new Intent(Settings.ACTION_PRINT_SETTINGS),
         new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE),
-        new Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS),
-        new Intent(Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS),
-        new Intent(Settings.ACTION_APPLICATION_SETTINGS),
         new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).setData(
                 Uri.parse("package:com.android.chrome")),
-        new Intent("android.settings.ACTION_OTHER_SOUND_SETTINGS"),
-        new Intent(Settings.ACTION_WIFI_IP_SETTINGS),
-        new Intent(Settings.ACTION_WIFI_SETTINGS),
         new Intent("android.settings.SHOW_INPUT_METHOD_PICKER"),
         new Intent(Intent.ACTION_INSERT).setData(Events.CONTENT_URI),
         new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL)
@@ -306,4 +306,4 @@
         }
         return null;
     }
-}
\ No newline at end of file
+}