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

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

Snap for 9735252 from 5c82ee16 to udc-release 

Change-Id: I4ba5343e3d356bf48be95405bb9352f280c10d9e
parents c441c6e9 5c82ee16

cmds/dumpstate/dumpstate.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,9 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { 
    }

    ds.AddDir(PREREBOOT_DATA_DIR, false);

    add_mountinfo();

    for (const char* path : {"/proc/cpuinfo", "/proc/meminfo"}) {

        ds.AddZipEntry(ZIP_ROOT_DIR + path, path);

    }

    DumpIpTablesAsRoot();

    DumpDynamicPartitionInfo();

    ds.AddDir(OTA_METADATA_DIR, true);

libs/binder/RecordedTransaction.cpp

+1 −2
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ std::optional<RecordedTransaction> RecordedTransaction::fromDetails( 
    t.mData.mInterfaceName = std::string(String8(interfaceName).string());

    if (interfaceName.size() != t.mData.mInterfaceName.size()) {

        LOG(ERROR) << "Interface Name is not valid. Contains characters that aren't single byte "

                      "utf-8: "

                   << interfaceName;

                      "utf-8.";

        return std::nullopt;

    }

libs/binder/TEST_MAPPING

+5 −0
Original line number Diff line number Diff line
@@ -119,5 +119,10 @@ 
    {

      "name": "memunreachable_binder_test"

    }

  ],

  "imports": [

    {

      "path": "packages/modules/Virtualization"

    }

  ]

}

libs/binder/tests/IBinderRpcTest.aidl

+4 −0
Original line number Diff line number Diff line
@@ -80,4 +80,8 @@ interface IBinderRpcTest { 
    // get queued.

    oneway void blockingSendFdOneway(in ParcelFileDescriptor fd);

    ParcelFileDescriptor blockingRecvFd();



    // Same as blockingSendFdOneway, but with integers.

    oneway void blockingSendIntOneway(int n);

    int blockingRecvInt();

}

libs/binder/tests/binderRpcTest.cpp

+9 −17
Original line number Diff line number Diff line
@@ -587,30 +587,22 @@ TEST_P(BinderRpc, OnewayCallQueueing) { 
        GTEST_SKIP() << "This test requires multiple threads";

    }



    constexpr size_t kNumSleeps = 10;

    constexpr size_t kNumQueued = 10;

    constexpr size_t kNumExtraServerThreads = 4;

    constexpr size_t kSleepMs = 50;



    // make sure calls to the same object happen on the same thread

    auto proc = createRpcTestSocketServerProcess({.numThreads = 1 + kNumExtraServerThreads});



    EXPECT_OK(proc.rootIface->lock());



    size_t epochMsBefore = epochMillis();



    // all these *Async commands should be queued on the server sequentially,

    // all these *Oneway commands should be queued on the server sequentially,

    // even though there are multiple threads.

    for (size_t i = 0; i + 1 < kNumSleeps; i++) {

        proc.rootIface->sleepMsAsync(kSleepMs);

    for (size_t i = 0; i + 1 < kNumQueued; i++) {

        proc.rootIface->blockingSendIntOneway(i);

    }

    for (size_t i = 0; i + 1 < kNumQueued; i++) {

        int n;

        proc.rootIface->blockingRecvInt(&n);

        EXPECT_EQ(n, i);

    }

    EXPECT_OK(proc.rootIface->unlockInMsAsync(kSleepMs));



    // this can only return once the final async call has unlocked

    EXPECT_OK(proc.rootIface->lockUnlock());



    size_t epochMsAfter = epochMillis();



    EXPECT_GE(epochMsAfter, epochMsBefore + kSleepMs * kNumSleeps);



    saturateThreadPool(1 + kNumExtraServerThreads, proc.rootIface);

}