Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bba5d59a authored by JW Wang's avatar JW Wang Committed by Android (Google) Code Review
Browse files

Merge "findNetworkStackApk returns an array of files (2/n)" into rvc-dev

parents afe43da8 f3a85cde
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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");