Fix `optimize-mainline-test` option for T+ device. am: 4dd69153f4temp_sam_236045730

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/2115626

Change-Id: I22f0c35012ad4800713da917618393cf365470d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/tradefed/targetprep/InstallApexModuleTargetPreparer.java b/src/com/android/tradefed/targetprep/InstallApexModuleTargetPreparer.java
index 26df54cf3..12b7f90df 100644
--- a/src/com/android/tradefed/targetprep/InstallApexModuleTargetPreparer.java
+++ b/src/com/android/tradefed/targetprep/InstallApexModuleTargetPreparer.java
@@ -295,7 +295,9 @@ public class InstallApexModuleTargetPreparer extends SuiteApkInstaller {
     Set<String> getApexInData(Set<ApexInfo> activatedApexes) {
         Set<String> apexInData = new HashSet<>();
         for (ApexInfo apex : activatedApexes) {
-            if (apex.sourceDir.startsWith(ACTIVATED_APEX_SOURCEDIR_PREFIX, 1)) {
+            if (apex.sourceDir.startsWith(APEX_DATA_DIR, 0) ||
+                apex.sourceDir.startsWith(STAGING_DATA_DIR, 0) ||
+                apex.sourceDir.startsWith(SESSION_DATA_DIR, 0)) {
                 apexInData.add(apex.name);
             }
         }