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

Commit ed8748a0 authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Update IsStrictRun to be framework-only" into main am: ab3dc0fd am:... 

Merge "Update IsStrictRun to be framework-only" into main am: ab3dc0fd am: f8910058 am: c8512d68 am: 5e060dac

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2681060



Change-Id: I2fd8966b863a7cd9ee98f6a2092f275060ef9194
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3083f077 5e060dac

cmds/dumpstate/DumpstateUtil.cpp

+4 −0
Original line number Diff line number Diff line
@@ -207,7 +207,9 @@ std::string PropertiesHelper::build_type_ = ""; 
int PropertiesHelper::dry_run_ = -1;

int PropertiesHelper::unroot_ = -1;

int PropertiesHelper::parallel_run_ = -1;

#if !defined(__ANDROID_VNDK__)

int PropertiesHelper::strict_run_ = -1;

#endif



bool PropertiesHelper::IsUserBuild() {

    if (build_type_.empty()) {
@@ -238,6 +240,7 @@ bool PropertiesHelper::IsParallelRun() { 
    return parallel_run_ == 1;

}



#if !defined(__ANDROID_VNDK__)

bool PropertiesHelper::IsStrictRun() {

    if (strict_run_ == -1) {

        // Defaults to using stricter timeouts.
@@ -245,6 +248,7 @@ bool PropertiesHelper::IsStrictRun() { 
    }

    return strict_run_ == 1;

}

#endif



int DumpFileToFd(int out_fd, const std::string& title, const std::string& path) {

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_NONBLOCK | O_CLOEXEC)));

cmds/dumpstate/DumpstateUtil.h

+4 −0
Original line number Diff line number Diff line
@@ -198,14 +198,18 @@ class PropertiesHelper { 
     * will default to true. This results in shortened timeouts for flaky

     * sections.

     */

#if !defined(__ANDROID_VNDK__)

    static bool IsStrictRun();

#endif



  private:

    static std::string build_type_;

    static int dry_run_;

    static int unroot_;

    static int parallel_run_;

#if !defined(__ANDROID_VNDK__)

    static int strict_run_;

#endif

};



/*