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

Commit 14a1cd9e authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Framework: Disable native-bridge for non-zygote 

Non-zygotes may not have the permissions/capabilities to run a
bridge and may abort attempts to load a bridge because of seccomp
rules. So don't tell the runtime to load a bridge when starting
a non-zygote.

Bug: 77878177
Bug: 80118963
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I7894b89feec79e4bd478f649c004ad29fc46597e
parent 72072cd7

core/jni/AndroidRuntime.cpp

+4 −1
Original line number Diff line number Diff line
@@ -907,10 +907,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    }



    // Native bridge library. "0" means that native bridge is disabled.

    //

    // Note: bridging is only enabled for the zygote. Other runs of

    //       app_process may not have the permissions to mount etc.

    property_get("ro.dalvik.vm.native.bridge", propBuf, "");

    if (propBuf[0] == '\0') {

        ALOGW("ro.dalvik.vm.native.bridge is not expected to be empty");

    } else if (strcmp(propBuf, "0") != 0) {

    } else if (zygote && strcmp(propBuf, "0") != 0) {

        snprintf(nativeBridgeLibrary, sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX,

                 "-XX:NativeBridge=%s", propBuf);

        addOption(nativeBridgeLibrary);