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

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

Snap for 12763142 from cb47c6c9 to 25Q1-release 

Change-Id: I12852e641004bfeec68eca14ae723da77870b81a
parents f5857aaf cb47c6c9

cmds/installd/tests/fuzzers/InstalldServiceFuzzer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ bool force_compile_without_image() { 
} // namespace android



extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

    // TODO(b/183141167): need to rewrite 'dump' to avoid SIGPIPE.

    signal(SIGPIPE, SIG_IGN);

    auto service = sp<InstalldNativeService>::make();

    fuzzService(service, FuzzedDataProvider(data, size));

    return 0;

libs/binder/BackendUnifiedServiceManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ bool BinderCacheWithInvalidation::isClientSideCachingEnabled(const std::string& 
              serviceName.c_str());

        return false;

    }

    if (kRemoveStaticList) return true;

    for (const char* name : kStaticCachableList) {

        if (name == serviceName) {

            return true;
@@ -175,7 +176,7 @@ Status BackendUnifiedServiceManager::updateCache(const std::string& serviceName, 
                                      "isBinderAlive_false");

    }

    // If we reach here with kRemoveStaticList=true then we know service isn't lazy

    else if (kRemoveStaticList || mCacheForGetService->isClientSideCachingEnabled(serviceName)) {

    else if (mCacheForGetService->isClientSideCachingEnabled(serviceName)) {

        binder::ScopedTrace aidlTrace(ATRACE_TAG_AIDL,

                                      "BinderCacheWithInvalidation::updateCache successful");

        return mCacheForGetService->setItem(serviceName, binder);

libs/renderengine/skia/SkiaRenderEngine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ void SkiaRenderEngine::drawLayersInternal( 
            const auto& item = layer.source.buffer;

            auto imageTextureRef = getOrCreateBackendTexture(item.buffer->getBuffer(), false);



            // if the layer's buffer has a fence, then we must must respect the fence prior to using

            // if the layer's buffer has a fence, then we must respect the fence prior to using

            // the buffer.

            if (layer.source.buffer.fence != nullptr) {

                waitFence(context, layer.source.buffer.fence->get());

services/surfaceflinger/common/FlagManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_ACONFIG_FLAG(deprecate_frame_tracker);

    DUMP_ACONFIG_FLAG(skip_invisible_windows_in_input);

    DUMP_ACONFIG_FLAG(begone_bright_hlg);

    DUMP_ACONFIG_FLAG(window_blur_kawase2);



#undef DUMP_ACONFIG_FLAG

#undef DUMP_LEGACY_SERVER_FLAG
@@ -264,6 +265,7 @@ FLAG_MANAGER_ACONFIG_FLAG(connected_display_hdr, "debug.sf.connected_display_hdr 
FLAG_MANAGER_ACONFIG_FLAG(deprecate_frame_tracker, "");

FLAG_MANAGER_ACONFIG_FLAG(skip_invisible_windows_in_input, "");

FLAG_MANAGER_ACONFIG_FLAG(begone_bright_hlg, "debug.sf.begone_bright_hlg");

FLAG_MANAGER_ACONFIG_FLAG(window_blur_kawase2, "");



/// Trunk stable server (R/W) flags ///

FLAG_MANAGER_ACONFIG_FLAG(refresh_rate_overlay_on_external_display, "")

services/surfaceflinger/common/include/common/FlagManager.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public: 
    bool skip_invisible_windows_in_input() const;

    bool begone_bright_hlg() const;

    bool luts_api() const;

    bool window_blur_kawase2() const;



protected:

    // overridden for unit tests