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

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

Snap for 13676478 from 1c9af499 to 25Q4-release

Change-Id: I55096ffcaa665d39341979c674386d26e50fa223
parents 651b67cd 1c9af499
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static const char* getReturnString(uint32_t cmd)
    if (idx < sizeof(kReturnStrings) / sizeof(kReturnStrings[0]))
        return kReturnStrings[idx];
    else
        return "unknown";
        return "(BR_* unknown)";
}

static const void* printBinderTransactionData(std::ostream& out, const void* data) {
@@ -1723,8 +1723,9 @@ void IPCThreadState::logExtendedError() {
    }
#endif

    ALOGE_IF(ee.command != BR_OK, "Binder transaction failure. id: %d, BR_*: %d, error: %d (%s)",
             ee.id, ee.command, ee.param, strerror(-ee.param));
    ALOGE_IF(ee.command != BR_OK,
             "Binder transaction failure. id: %d, cmd: %s (%d), error: %d (%s)", ee.id,
             getReturnString(ee.command), ee.command, ee.param, strerror(-ee.param));
}

void IPCThreadState::freeBuffer(const uint8_t* data, size_t /*dataSize*/,
+11 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static constexpr int kKernelThreads = 17; // anything different than the default

static String16 binderLibTestServiceName = String16("test.binderLib");

enum BinderLibTestTranscationCode {
enum BinderLibTestTransactionCode {
    BINDER_LIB_TEST_NOP_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,
    BINDER_LIB_TEST_REGISTER_SERVER,
    BINDER_LIB_TEST_ADD_SERVER,
@@ -486,6 +486,8 @@ class BinderLibTestEvent
        pthread_t m_triggeringThread;
};

[[clang::no_destroy]] static const StaticString16 kBinderLibTestCallbackDescriptor(
        u"BinderLibTestCallBack");
class BinderLibTestCallBack : public BBinder, public BinderLibTestEvent
{
    public:
@@ -500,6 +502,9 @@ class BinderLibTestCallBack : public BBinder, public BinderLibTestEvent
        }

    private:
        virtual const String16& getInterfaceDescriptor() const override {
            return kBinderLibTestCallbackDescriptor;
        }
        virtual status_t onTransact(uint32_t code,
                                    const Parcel& data, Parcel* reply,
                                    uint32_t flags = 0)
@@ -2242,6 +2247,8 @@ TEST_F(BinderLibRpcTest, BinderObserverIntegrationTest) {
INSTANTIATE_TEST_SUITE_P(BinderLibTest, BinderLibRpcTestP, testing::Bool(),
                         BinderLibRpcTestP::ParamToString);

[[clang::no_destroy]] static const StaticString16 kBinderLibTestServiceDescriptor(
        u"BinderLibTestService");
class BinderLibTestService : public BBinder {
public:
    explicit BinderLibTestService(int32_t id, bool exitOnDestroy = true)
@@ -2266,6 +2273,9 @@ public:
        }
    }

    virtual const String16& getInterfaceDescriptor() const override {
        return kBinderLibTestServiceDescriptor;
    }
    virtual status_t onTransact(uint32_t code, const Parcel &data, Parcel *reply,
                                uint32_t flags = 0) {
        // TODO(b/182914638): also checks getCallingUid() for RPC
+8 −1
Original line number Diff line number Diff line
@@ -219,7 +219,14 @@ TEST_P(FoldableTest, disableVsyncOnPowerOffPacesetter) {
    ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), getOuterDisplayId());
}

TEST_F(FoldableTest, layerCachingTexturePoolOnFrontInternal) {
TEST_P(FoldableTest, layerCachingTexturePoolOnFrontInternal) {
    SET_FLAG_FOR_TEST(flags::pacesetter_selection, GetParam());

    ON_CALL(mFlinger.mockSchedulerCallback(), enableLayerCachingTexturePool)
            .WillByDefault([&](PhysicalDisplayId displayId, bool enable) {
                mFlinger.enableLayerCachingTexturePool(displayId, enable);
            });

    ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), getInnerDisplayId());

    // In order for TexturePool to be enabled, layer caching needs to be enabled.
+4 −0
Original line number Diff line number Diff line
@@ -619,6 +619,10 @@ public:
        mFlinger->mNewLayers.emplace_back(std::move(layer));
    }

    void enableLayerCachingTexturePool(PhysicalDisplayId id, bool enable) {
        FTL_FAKE_GUARD(kMainThreadContext, mFlinger->enableLayerCachingTexturePool(id, enable));
    }

    /* ------------------------------------------------------------------------
     * Read-only access to private data to assert post-conditions.
     */