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

Commit 74210e87 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6453963 from 0b4313fe to rvc-release 

Change-Id: I81602a81755c269dc1b0a957154a76a92a96f70d
parents 0dbb65af 0b4313fe

fastboot/fuzzy_fastboot/main.cpp

+4 −0
Original line number Diff line number Diff line
@@ -261,6 +261,10 @@ TEST_F(LogicalPartitionCompliance, CreateResizeDeleteLP) { 
    GTEST_LOG_(INFO) << "Flashing a logical partition..";

    EXPECT_EQ(fb->FlashPartition(test_partition_name, buf), SUCCESS)

            << "flash logical -partition failed";



    GTEST_LOG_(INFO) << "Testing 'fastboot delete-logical-partition' command";

    EXPECT_EQ(fb->DeletePartition(test_partition_name), SUCCESS)

            << "delete logical-partition failed";

}



// Conformance tests

fs_mgr/libfiemap/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ cc_test { 
        "libdm",

        "libfs_mgr",

        "liblog",

        "libgsi",

    ],



    data: [

fs_mgr/libfiemap/fiemap_writer_test.cpp

+5 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <libdm/loop_control.h>

#include <libfiemap/fiemap_writer.h>

#include <libfiemap/split_fiemap_writer.h>

#include <libgsi/libgsi.h>



#include "utility.h"
@@ -148,8 +149,11 @@ TEST_F(FiemapWriterTest, CheckBlockDevicePath) { 
    FiemapUniquePtr fptr = FiemapWriter::Open(testfile, gBlockSize);

    EXPECT_EQ(fptr->size(), gBlockSize);

    EXPECT_EQ(fptr->bdev_path().find("/dev/block/"), size_t(0));



    if (!android::gsi::IsGsiRunning()) {

        EXPECT_EQ(fptr->bdev_path().find("/dev/block/dm-"), string::npos);

    }

}



TEST_F(FiemapWriterTest, CheckFileCreated) {

    FiemapUniquePtr fptr = FiemapWriter::Open(testfile, 32768);

fs_mgr/libsnapshot/test_helpers.cpp

+2 −2
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ AssertionResult LowSpaceUserdata::ReadUserdataStats() { 
        return AssertionFailure() << strerror(errno);

    }

    bsize_ = buf.f_bsize;

    free_space_ = buf.f_bsize * buf.f_bfree;

    available_space_ = buf.f_bsize * buf.f_bavail;

    free_space_ = bsize_ * buf.f_bfree;

    available_space_ = bsize_ * buf.f_bavail;

    return AssertionSuccess();

}

init/README.md

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,10 @@ runs the service. 
  This is mutually exclusive with the console option, which additionally connects stdin to the

  given console.



`task_profiles <profile> [ <profile>\* ]`

> Set task profiles for the process when it forks. This is designed to replace the use of

  writepid option for moving a process into a cgroup.



`timeout_period <seconds>`

> Provide a timeout after which point the service will be killed. The oneshot keyword is respected

  here, so oneshot services do not automatically restart, however all other services will.
@@ -356,6 +360,8 @@ runs the service. 
  cgroup/cpuset usage. If no files under /dev/cpuset/ are specified, but the

  system property 'ro.cpuset.default' is set to a non-empty cpuset name (e.g.

  '/foreground'), then the pid is written to file /dev/cpuset/_cpuset\_name_/tasks.

  The use of this option for moving a process into a cgroup is obsolete. Please

  use task_profiles option instead.





Triggers