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

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

Merge cherrypicks of ['android-review.googlesource.com/3152117',... 

Merge cherrypicks of ['android-review.googlesource.com/3152117', 'googleplex-android-review.googlesource.com/28106238'] into 24Q3-release.

Change-Id: If7d6a3aac0e552b8ce073a661d5bf4b2b0fd950d
parents 5601165b 454f7f27

data/etc/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -376,6 +376,14 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

}



// installed in system for GSI

prebuilt_etc {

    name: "android.software.credentials.prebuilt.xml",

    relative_install_path: "permissions",

    src: "android.software.credentials.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "android.software.device_id_attestation.prebuilt.xml",

    src: "android.software.device_id_attestation.xml",

services/surfaceflinger/RegionSamplingThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ void RegionSamplingThread::captureSample() { 


    FenceResult fenceResult;

    if (FlagManager::getInstance().single_hop_screenshot() &&

        FlagManager::getInstance().ce_fence_promise()) {

        FlagManager::getInstance().ce_fence_promise() && mFlinger.mRenderEngine->isThreaded()) {

        std::vector<sp<LayerFE>> layerFEs;

        auto displayState =

                mFlinger.getDisplayAndLayerSnapshotsFromMainThread(renderAreaBuilder,

services/surfaceflinger/SurfaceFlinger.cpp

+3 −5
Original line number Diff line number Diff line
@@ -8194,7 +8194,7 @@ void SurfaceFlinger::captureScreenCommon(RenderAreaBuilderVariant renderAreaBuil 
    }



    if (FlagManager::getInstance().single_hop_screenshot() &&

        FlagManager::getInstance().ce_fence_promise()) {

        FlagManager::getInstance().ce_fence_promise() && mRenderEngine->isThreaded()) {

        std::vector<sp<LayerFE>> layerFEs;

        auto displayState =

                getDisplayAndLayerSnapshotsFromMainThread(renderAreaBuilder, getLayerSnapshotsFn,
@@ -8568,10 +8568,8 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl( 
    // to CompositionEngine::present.

    ftl::SharedFuture<FenceResult> presentFuture;

    if (FlagManager::getInstance().single_hop_screenshot() &&

        FlagManager::getInstance().ce_fence_promise()) {

        presentFuture = mRenderEngine->isThreaded()

                ? ftl::yield(present()).share()

                : mScheduler->schedule(std::move(present)).share();

        FlagManager::getInstance().ce_fence_promise() && mRenderEngine->isThreaded()) {

        presentFuture = ftl::yield(present()).share();

    } else {

        presentFuture = mRenderEngine->isThreaded() ? ftl::defer(std::move(present)).share()

                                                    : ftl::yield(present()).share();