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

Commit eef14795 authored by JW Wang's avatar JW Wang Committed by Automerger Merge Worker
Browse files

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

Merge "findNetworkStackApk returns an array of files (2/n)" into rvc-dev am: bba5d59a am: 89a6147d am: 7d1ddd7e am: 9d43f9d8

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

Change-Id: Id169b2b4de7ec06ba75a2b88d0524c7fcae3b9cd
parents 0169d155 9d43f9d8

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/NetworkStagedRollbackTest.java

+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");