Revert "StagedInstallTest: do not use /data/apex/active"

Revert submission 34694556-apexinfo.isfactory

Reason for revert: Droidmonitor initiated the revert due to http://b/437851540 - verifying through ABTD before submission. 

Fix: 437851540

Reverted changes: /q/submissionid:34694556-apexinfo.isfactory

Change-Id: Ica204dfee4247690b837226b08ac85f5421418eb

hostsidetests/install/app/src/android/cts/install/SamegradeTest.java

diff --git a/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java b/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java
index b2a29ae..4147290 100644
--- a/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java
+++ b/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java
@@ -152,7 +152,8 @@
                 .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);
         assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)
                 .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
-        assertThat(shim.applicationInfo.sourceDir.startsWith("/system")).isFalse();
+        assertThat(shim.applicationInfo.sourceDir)
+                .isEqualTo("/data/apex/active/com.android.apex.cts.shim@1.apex");
         assertThat(shim.applicationInfo.publicSourceDir)
                 .isEqualTo(shim.applicationInfo.sourceDir);
     }

hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java

diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
index 1ae9f87..19200f5 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
@@ -65,8 +65,13 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1026,7 +1031,8 @@
                 .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);
         assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED).isEqualTo(
                 ApplicationInfo.FLAG_INSTALLED);
-        assertThat(shim.applicationInfo.sourceDir.startsWith("/system/apex")).isFalse();
+        assertThat(shim.applicationInfo.sourceDir)
+                .isEqualTo("/data/apex/active/com.android.apex.cts.shim@1.apex");
         assertThat(shim.applicationInfo.publicSourceDir).isEqualTo(shim.applicationInfo.sourceDir);
     }
 
@@ -1200,7 +1206,7 @@
                     .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);
             assertThat(apex.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)
                     .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
-            assertThat(apex.applicationInfo.sourceDir.startsWith("/system/apex")).isFalse();
+            assertThat(apex.applicationInfo.sourceDir).startsWith("/data/apex/active");
         }
         {
             PackageInfo apex = pm.getPackageInfo(SHIM_APEX_PACKAGE_NAME,
@@ -1230,7 +1236,7 @@
                     .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);
             assertThat(apex.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)
                     .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
-            assertThat(apex.applicationInfo.sourceDir.startsWith("/system/apex")).isFalse();
+            assertThat(apex.applicationInfo.sourceDir).startsWith("/data/apex/active");
         }
         {
             PackageInfo apex = pm.getPackageInfo(SHIM_APEX_PACKAGE_NAME,
@@ -1259,7 +1265,7 @@
                     .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);
             assertThat(apex.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)
                     .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
-            assertThat(apex.applicationInfo.sourceDir.startsWith("/system/apex")).isFalse();
+            assertThat(apex.applicationInfo.sourceDir).startsWith("/data/apex/active");
         }
 
         InstallUtils.commitExpectingFailure(

hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java

diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
index fe39fe0..53511d4 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
@@ -38,6 +38,7 @@
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -651,7 +652,7 @@
                 () -> new AssertionError("Can't find " + SHIM_APEX_PACKAGE_NAME)
         );
 
-        assertThat(shimApex.isFactory).isFalse();
+        assertThat(shimApex.sourceDir).startsWith("/data/apex/active");
         assertThat(getDevice().pullFile(shimApex.sourceDir)).isNotNull();
     }
 
@@ -896,10 +897,7 @@
 
         private String getStagedSessions() {
             try {
-                return mInstance
-                        .getDevice()
-                        .executeShellV2Command("pm get-stagedsessions")
-                        .getStdout();
+                return mInstance.getDevice().executeShellV2Command("pm get-stagedsessions").getStdout();
             } catch (DeviceNotAvailableException e) {
                 Log.e(TAG, e);
                 return "Failed to get staged sessions";