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

Commit ac2c632f authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am c0999f78: Merge "Frameworks/base: Hand fingerprint to ART" 

* commit 'c0999f78':
  Frameworks/base: Hand fingerprint to ART
parents 802da28f c0999f78

core/jni/AndroidRuntime.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -589,6 +589,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char cpuAbiListBuf[sizeof("--cpu-abilist=") + PROPERTY_VALUE_MAX];

    char cpuAbiListBuf[sizeof("--cpu-abilist=") + PROPERTY_VALUE_MAX];

    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    char fingerprintBuf[sizeof("-Xfingerprint:") + PROPERTY_VALUE_MAX];





    bool checkJni = false;

    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");

    property_get("dalvik.vm.checkjni", propBuf, "");
@@ -906,6 +907,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        addOption("--generate-debug-info");

        addOption("--generate-debug-info");

    }

    }





    /*

     * Retrieve the build fingerprint and provide it to the runtime. That way, ANR dumps will

     * contain the fingerprint and can be parsed.

     */

    parseRuntimeOption("ro.build.fingerprint", fingerprintBuf, "-Xfingerprint:");



    initArgs.version = JNI_VERSION_1_4;

    initArgs.version = JNI_VERSION_1_4;

    initArgs.options = mOptions.editArray();

    initArgs.options = mOptions.editArray();

    initArgs.nOptions = mOptions.size();

    initArgs.nOptions = mOptions.size();