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

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

Snap for 9626528 from 4cab9e26 to udc-release 

Change-Id: I8c105b6c2c678b9a397301a5a3ce89fd2ac0d435
parents 8141b44d 4cab9e26

libs/binder/rust/rpcbinder/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ rust_library { 
    ],

    visibility: [

        "//device/google/cuttlefish/shared/minidroid/sample",

        "//packages/modules/Uwb",

        "//packages/modules/Virtualization:__subpackages__",

    ],

    apex_available: [

libs/binder/tests/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -397,6 +397,11 @@ cc_binary { 


cc_test {

    name: "binderRpcTest",

    // TODO(b/269799024)

    test_options: {

        unit_test: false,

    },



    defaults: [

        "binderRpcTest_defaults",

        "binderRpcTest_shared_defaults",

libs/binderdebug/include/binderdebug/BinderDebug.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

#pragma once



#include <utils/Errors.h>



#include <map>

#include <vector>

libs/gui/LayerState.cpp

+10 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ status_t layer_state_t::write(Parcel& output) const 
    SAFE_PARCEL(output.writeParcelable, trustedPresentationListener);

    SAFE_PARCEL(output.writeFloat, currentSdrHdrRatio);

    SAFE_PARCEL(output.writeFloat, desiredSdrHdrRatio);

    SAFE_PARCEL(output.writeInt32, static_cast<int32_t>(cachingHint))

    return NO_ERROR;

}
@@ -328,6 +329,10 @@ status_t layer_state_t::read(const Parcel& input) 
    SAFE_PARCEL(input.readFloat, &tmpFloat);

    desiredSdrHdrRatio = tmpFloat;



    int32_t tmpInt32;

    SAFE_PARCEL(input.readInt32, &tmpInt32);

    cachingHint = static_cast<gui::CachingHint>(tmpInt32);



    return NO_ERROR;

}
@@ -580,6 +585,10 @@ void layer_state_t::merge(const layer_state_t& other) { 
        desiredSdrHdrRatio = other.desiredSdrHdrRatio;

        currentSdrHdrRatio = other.currentSdrHdrRatio;

    }

    if (other.what & eCachingHintChanged) {

        what |= eCachingHintChanged;

        cachingHint = other.cachingHint;

    }

    if (other.what & eHdrMetadataChanged) {

        what |= eHdrMetadataChanged;

        hdrMetadata = other.hdrMetadata;
@@ -731,6 +740,7 @@ uint64_t layer_state_t::diff(const layer_state_t& other) const { 
    CHECK_DIFF(diff, eDataspaceChanged, other, dataspace);

    CHECK_DIFF2(diff, eExtendedRangeBrightnessChanged, other, currentSdrHdrRatio,

                desiredSdrHdrRatio);

    CHECK_DIFF(diff, eCachingHintChanged, other, cachingHint);

    CHECK_DIFF(diff, eHdrMetadataChanged, other, hdrMetadata);

    if (other.what & eSurfaceDamageRegionChanged &&

        (!surfaceDamageRegion.hasSameRects(other.surfaceDamageRegion))) {

libs/gui/SurfaceComposerClient.cpp

+14 −0
Original line number Diff line number Diff line
@@ -1729,6 +1729,20 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setExten 
    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setCachingHint(

        const sp<SurfaceControl>& sc, gui::CachingHint cachingHint) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eCachingHintChanged;

    s->cachingHint = cachingHint;



    registerSurfaceControlForCallback(sc);

    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setHdrMetadata(

        const sp<SurfaceControl>& sc, const HdrMetadata& hdrMetadata) {

    layer_state_t* s = getLayerState(sc);