Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search more NetworkStack paths

Browse Source 
The test failed because it can't find the apk file for NetworkStack.
Let's include more names for search.

Bug: 154792230
Test: atest NetworkStagedRollbackTest
Change-Id: I0909e531fcd0e99fcedb8d07ba0be01f4e762914
This commit is contained in:
JW Wang
2020-04-23 17:18:55 +08:00
parent e43eb84915
commit 89325cf2cd
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/NetworkStagedRollbackTest.java
View File

@@ -52,15 +52,21 @@ public class NetworkStagedRollbackTest {
private static final String PROPERTY_WATCHDOG_REQUEST_TIMEOUT_MILLIS =
"watchdog_request_timeout_millis";
private static final String[] NETWORK_STACK_APK_NAMES = {
"NetworkStack", "NetworkStackGoogle", "NetworkStackNext", "NetworkStackNextGoogle"
};
private static final TestApp NETWORK_STACK = new TestApp("NetworkStack",
getNetworkStackPackageName(), -1, false, findNetworkStackApk());
private static File findNetworkStackApk() {
final File apk = new File("/system/priv-app/NetworkStack/NetworkStack.apk");
if (apk.isFile()) {
return apk;
for (String name : NETWORK_STACK_APK_NAMES) {
final File apk = new File("/system/priv-app/" + name + "/" + name + ".apk");
if (apk.isFile()) {
return apk;
}
}
return new File("/system/priv-app/NetworkStackNext/NetworkStackNext.apk");
throw new RuntimeException("Can't find NetworkStackApk");
}
/**