| commit | eef14795db84e42806821b25fd82467e1f2d8383 | [log] [tgz] |
|---|---|---|
| author | JW Wang <wangchun@google.com> | Tue Jun 30 14:56:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 30 14:56:30 2020 +0000 |
| tree | 3a8ab4dad368b73a6f6778af9b9048688f98ed4c | |
| parent | 0169d155c130625601d37051b3109a4e3165d212 [diff] | |
| parent | 9d43f9d8d730ff4626d97a1c3fa0f5cd27018cd8 [diff] |
Merge "findNetworkStackApk returns an array of files (2/n)" into rvc-dev am: bba5d59a4e am: 89a6147d2f am: 7d1ddd7e94 am: 9d43f9d8d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004938 Change-Id: Id169b2b4de7ec06ba75a2b88d0524c7fcae3b9cd
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 42b0c60..314e952 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 @@ 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");