Merge "Fix CtsAppSecurityHostTestCases test cases" into android14-tests-dev

Author: rachitjain2706

hostsidetests/appsecurity/test-apps/rro/OverlayTarget/AndroidManifest.xml

@@ -20,6 +20,7 @@
         <uses-library android:name="android.test.runner" />
         <activity android:name=".OverlayTargetActivity" android:exported="false"
                   android:configChanges="@integer/config_changes_assets_paths" />
+        <activity android:name=".SimpleActivity" android:exported="true" />
         <service android:name=".OverlayTargetService" android:exported="false" />
     </application>
 

hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetTest.java

@@ -89,7 +89,7 @@ public void overlayEnabled_activityInForeground() throws Exception {
     public void overlayEnabled_activityInBackground_toForeground() throws Exception {
         final OverlayTargetActivity targetActivity = mActivityTestRule.getActivity();
         // Activity goes into background
-        launchHome();
+        launchSimpleActivity();
         mInstrumentation.waitForIdleSync();
         final CountDownLatch latch = new CountDownLatch(1);
         targetActivity.setConfigurationChangedCallback((activity, config) -> {
@@ -137,9 +137,11 @@ private static void setOverlayEnabled(String overlayPackage, boolean enabled)
                 () -> expected.equals(getStateForOverlay(overlayPackage)));
     }
 
-    private static void launchHome() {
-        SystemUtil.runShellCommand("am start -W -a android.intent.action.MAIN"
-                + " -c android.intent.category.HOME");
+    private void launchSimpleActivity() {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(mInstrumentation.getTargetContext(), SimpleActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mInstrumentation.startActivitySync(intent);
     }
 
     private static String getStateForOverlay(String overlayPackage) {

hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/SimpleActivity.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.overlay.target;
+
+import android.app.Activity;
+
+/**
+ * Another activity doing nothing
+ */
+public class SimpleActivity extends Activity {
+}