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

Commit 00c9033b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Ravenwood] Several minor fixes" into main am: 0d42cb57 am: 0708cf04 

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



Change-Id: I0492b15a2f9cbe62b9c4ff895b10f97b7fa00122
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa808edc 0708cf04

ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodTestStats.java

+3 −3
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ public class RavenwoodTestStats { 
        try {

            mOutputWriter = new PrintWriter(mOutputFile);

        } catch (IOException e) {

            throw new RuntimeException("Failed to crete logfile. File=" + mOutputFile, e);

            throw new RuntimeException("Failed to create logfile. File=" + mOutputFile, e);

        }



        // Crete the "latest" symlink.

        // Create the "latest" symlink.

        Path symlink = Paths.get(tmpdir, basename + "latest.csv");

        try {

            if (Files.exists(symlink)) {
@@ -96,7 +96,7 @@ public class RavenwoodTestStats { 
            Files.createSymbolicLink(symlink, Paths.get(mOutputFile.getName()));



        } catch (IOException e) {

            throw new RuntimeException("Failed to crete logfile. File=" + mOutputFile, e);

            throw new RuntimeException("Failed to create logfile. File=" + mOutputFile, e);

        }



        Log.i(TAG, "Test result stats file: " + mOutputFile);

ravenwood/runtime-jni/ravenwood_sysprop.cpp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static bool property_set(const char* key, const char* value) { 
    if (key == nullptr || *key == '\0') return false;

    if (value == nullptr) value = "";

    bool read_only = !strncmp(key, "ro.", 3);

    if (!read_only && strlen(value) >= PROP_VALUE_MAX) return -1;

    if (!read_only && strlen(value) >= PROP_VALUE_MAX) return false;



    std::lock_guard lock(g_properties_lock);

    auto [it, success] = g_properties.emplace(key, value);