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

Commit c3fdc24c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7460608 from fa14db8a to sc-d1-release 

Change-Id: I062b64a990ec9e02f7c5cb2c5d64ffaf322bf97c
parents 19683313 fa14db8a

libs/binder/rust/src/native.rs

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ use std::convert::TryFrom; 
use std::ffi::{c_void, CString};

use std::mem::ManuallyDrop;

use std::ops::Deref;

use std::ptr;



/// Rust wrapper around Binder remotable objects.

///
@@ -273,7 +272,7 @@ impl<T: Remotable> InterfaceClassMethods for Binder<T> { 
    /// Must be called with a valid pointer to a `T` object. After this call,

    /// the pointer will be invalid and should not be dereferenced.

    unsafe extern "C" fn on_destroy(object: *mut c_void) {

        ptr::drop_in_place(object as *mut T)

        Box::from_raw(object as *mut T);

    }



    /// Called whenever a new, local `AIBinder` object is needed of a specific

libs/renderengine/threaded/RenderEngineThreaded.cpp

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <android-base/stringprintf.h>

#include <private/gui/SyncFeatures.h>

#include <processgroup/processgroup.h>

#include <utils/Trace.h>



#include "gl/GLESRenderEngine.h"
@@ -80,6 +81,10 @@ status_t RenderEngineThreaded::setSchedFifo(bool enabled) { 
void RenderEngineThreaded::threadMain(CreateInstanceFactory factory) NO_THREAD_SAFETY_ANALYSIS {

    ATRACE_CALL();



    if (!SetTaskProfiles(0, {"SFRenderEnginePolicy"})) {

        ALOGW("Failed to set render-engine task profile!");

    }



    if (setSchedFifo(true) != NO_ERROR) {

        ALOGW("Couldn't set SCHED_FIFO");

    }

services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ struct CompositionRefreshArgs { 


    // The earliest time to send the present command to the HAL

    std::chrono::steady_clock::time_point earliestPresentTime;



    // The predicted next invalidation time

    std::optional<std::chrono::steady_clock::time_point> nextInvalidateTime;

};



} // namespace android::compositionengine

services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ protected: 
    virtual std::optional<base::unique_fd> composeSurfaces(

            const Region&, const compositionengine::CompositionRefreshArgs& refreshArgs) = 0;

    virtual void postFramebuffer() = 0;

    virtual void renderCachedSets() = 0;

    virtual void renderCachedSets(const CompositionRefreshArgs&) = 0;

    virtual void chooseCompositionStrategy() = 0;

    virtual bool getSkipColorTransform() const = 0;

    virtual FrameFences presentAndGetFrameFences() = 0;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public: 
    std::optional<base::unique_fd> composeSurfaces(

            const Region&, const compositionengine::CompositionRefreshArgs& refreshArgs) override;

    void postFramebuffer() override;

    void renderCachedSets() override;

    void renderCachedSets(const CompositionRefreshArgs&) override;

    void cacheClientCompositionRequests(uint32_t) override;



    // Testing