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

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

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

Change-Id: I27d69159cdf3137a8b2e9ccb0f0b09bccc0109d5
This commit is contained in:
JW Wang
2020-06-30 14:21:14 +00:00
committed by Automerger Merge Worker
parent f3d73b40ee 89a6147d2f
commit 7d1ddd7e94
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,11 +61,12 @@ public class NetworkStagedRollbackTest {
private static final TestApp NETWORK_STACK = new TestApp("NetworkStack", private static final TestApp NETWORK_STACK = new TestApp("NetworkStack",
getNetworkStackPackageName(), -1, false, findNetworkStackApk()); getNetworkStackPackageName(), -1, false, findNetworkStackApk());
private static File findNetworkStackApk() { private static File[] findNetworkStackApk() {
for (String name : NETWORK_STACK_APK_NAMES) { for (String name : NETWORK_STACK_APK_NAMES) {
final File apk = new File("/system/priv-app/" + name + "/" + name + ".apk"); final File apk = new File("/system/priv-app/" + name + "/" + name + ".apk");
if (apk.isFile()) { 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"); throw new RuntimeException("Can't find NetworkStackApk");