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

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

Snap for 10897809 from 5d694d78 to 24Q1-release 

Change-Id: I20dce00da8d5c3198a3d2526055f5bd13ce956e8
parents 8cdcd60e 5d694d78

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_worker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ bool WorkerThread::ProcessReplaceOp(const CowOperation* cow_op) { 
    ssize_t rv = reader_->ReadData(cow_op, buffer, BLOCK_SZ);

    if (rv != BLOCK_SZ) {

        SNAP_LOG(ERROR) << "ProcessReplaceOp failed for block " << cow_op->new_block

                        << ", return = " << rv;

                        << ", return = " << rv << ", COW operation = " << *cow_op;

        return false;

    }

    return true;

fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp

+2 −1
Original line number Diff line number Diff line
@@ -283,7 +283,8 @@ bool ReadWorker::ReadAlignedSector(sector_t sector, size_t sz) { 
                // We found the sector in mapping. Check the type of COW OP and

                // process it.

                if (!ProcessCowOp(it->second, buffer)) {

                    SNAP_LOG(ERROR) << "ProcessCowOp failed";

                    SNAP_LOG(ERROR)

                            << "ProcessCowOp failed, sector = " << sector << ", size = " << sz;

                    return false;

                }

init/capabilities.cpp

+0 −6
Original line number Diff line number Diff line
@@ -66,18 +66,12 @@ static const std::map<std::string, int> cap_map = { 
        CAP_MAP_ENTRY(WAKE_ALARM),

        CAP_MAP_ENTRY(BLOCK_SUSPEND),

        CAP_MAP_ENTRY(AUDIT_READ),

#if defined(__BIONIC__)

        CAP_MAP_ENTRY(PERFMON),

        CAP_MAP_ENTRY(BPF),

        CAP_MAP_ENTRY(CHECKPOINT_RESTORE),

#endif

};



#if defined(__BIONIC__)

static_assert(CAP_LAST_CAP == CAP_CHECKPOINT_RESTORE, "CAP_LAST_CAP is not CAP_CHECKPOINT_RESTORE");

#else

static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");

#endif



static bool ComputeCapAmbientSupported() {

#if defined(__ANDROID__)

init/capabilities.h

+0 −11
Original line number Diff line number Diff line
@@ -21,17 +21,6 @@ 
#include <string>

#include <type_traits>



#if !defined(__ANDROID__)

#ifndef CAP_BLOCK_SUSPEND

#define CAP_BLOCK_SUSPEND 36

#endif

#ifndef CAP_AUDIT_READ

#define CAP_AUDIT_READ 37

#endif

#undef CAP_LAST_CAP

#define CAP_LAST_CAP CAP_AUDIT_READ

#endif



namespace android {

namespace init {