commit 150bdd24ccb971cfd05da6b82dd47dbc10462433
author Chong Zhang <chz@google.com> Mon Jun 27 11:24:04 2016 -0700
committer Chong Zhang <chz@google.com> Tue Jun 28 12:57:39 2016 -0700
tree d5b46e984c9fa65379bd4d29a801155fab02b7a5
parent bc97c45e7aeda460eff6c9bd8cb9013302fdfa58

cts: test am start -D & -W

bug: 29451567
bug: 28980761
bug: 28333487
bug: 27931552

Change-Id: I378ac5c4125102aabdf49223c59c2705deed530d

hostsidetests/services/activitymanager/app/AndroidManifest.xml

diff --git a/hostsidetests/services/activitymanager/app/AndroidManifest.xml b/hostsidetests/services/activitymanager/app/AndroidManifest.xml
index 3523478..00c6352 100755
--- a/hostsidetests/services/activitymanager/app/AndroidManifest.xml
+++ b/hostsidetests/services/activitymanager/app/AndroidManifest.xml
@@ -159,6 +159,15 @@
             android:exported="true"
             android:launchMode="singleInstance"
         />
+        <activity android:name=".TrampolineActivity"
+                  android:exported="true"
+                  android:theme="@android:style/Theme.NoDisplay"
+        />
+        <activity-alias android:enabled="true"
+                android:exported="true"
+                android:name=".EntryPointAliasActivity"
+                android:targetActivity=".TrampolineActivity" >
+        </activity-alias>
     </application>
 </manifest>