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

Commit bde66d28 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8827792 from 6bc4d482 to tm-qpr1-release 

Change-Id: I4faf958de5769630f6787345547e208e2ddb5aca
parents 7b6d5a49 6bc4d482

fs_mgr/libsnapshot/snapshot_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2755,6 +2755,10 @@ bool IsDaemonRequired() { 
        return false;

    }



    if (!IsCompressionEnabled()) {

        return false;

    }



    const std::string UNKNOWN = "unknown";

    const std::string vendor_release =

            android::base::GetProperty("ro.vendor.build.version.release_or_codename", UNKNOWN);

fs_mgr/libsnapshot/vts_ota_config_test.cpp

+7 −0
Original line number Diff line number Diff line
@@ -17,7 +17,14 @@ 
#include <android-base/properties.h>

#include <gtest/gtest.h>



static int GetVsrLevel() {

    return android::base::GetIntProperty("ro.vendor.api_level", -1);

}



TEST(VAB, Enabled) {

    ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false));

    if (GetVsrLevel() < __ANDROID_API_T__) {

        GTEST_SKIP();

    }

    ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.userspace.snapshots.enabled", false));

}

fs_mgr/tests/vts_fs_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ static int GetVsrLevel() { 
}



TEST(fs, ErofsSupported) {

    // S and higher for this test.

    if (GetVsrLevel() < __ANDROID_API_S__) {

    // U and higher for this test.

    if (GetVsrLevel() <= __ANDROID_API_T__) {

        GTEST_SKIP();

    }