Merge "findNetworkStackApk returns an array of files (2/n)" into rvc-dev am: bba5d59a4e am: 89a6147d2f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004938

Change-Id: I256fca06682015dbb4ae06defbbff432c7189613

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/NetworkStagedRollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/NetworkStagedRollbackTest.java
index 42b0c608822e..314e95229d29 100644
--- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/NetworkStagedRollbackTest.java
+++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/NetworkStagedRollbackTest.java
@@ -61,11 +61,12 @@ public class NetworkStagedRollbackTest {
     private static final TestApp NETWORK_STACK = new TestApp("NetworkStack",
             getNetworkStackPackageName(), -1, false, findNetworkStackApk());
 
-    private static File findNetworkStackApk() {
+    private static File[] findNetworkStackApk() {
         for (String name : NETWORK_STACK_APK_NAMES) {
             final File apk = new File("/system/priv-app/" + name + "/" + name + ".apk");
             if (apk.isFile()) {
-                return apk;
+                final File dir = new File("/system/priv-app/" + name);
+                return dir.listFiles((d, f) -> f.startsWith(name));
             }
         }
         throw new RuntimeException("Can't find NetworkStackApk");