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

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

am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base:... 

am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit '505a252c':
  Frameworks/base: Hand fingerprint to ART
parents 58b2d330 505a252c

core/jni/AndroidRuntime.cpp

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

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

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

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



    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");
@@ -908,6 +909,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        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.options = mOptions.editArray();

    initArgs.nOptions = mOptions.size();