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

Commit 52ef2085 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Move frontend code to frontend namespace"

parents e060ce13 af6d2978

services/surfaceflinger/DisplayDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


#include "Display/DisplaySnapshot.h"

#include "DisplayDevice.h"

#include "FrontEnd/FrontEndDisplayInfo.h"

#include "FrontEnd/DisplayInfo.h"

#include "Layer.h"

#include "RefreshRateOverlay.h"

#include "SurfaceFlinger.h"
@@ -132,7 +132,7 @@ void DisplayDevice::setDisplayName(const std::string& displayName) { 
    }

}



auto DisplayDevice::getFrontEndInfo() const -> FrontEndDisplayInfo {

auto DisplayDevice::getFrontEndInfo() const -> frontend::DisplayInfo {

    gui::DisplayInfo info;

    info.displayId = getLayerStack().id;

services/surfaceflinger/DisplayDevice.h

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "DisplayHardware/DisplayMode.h"

#include "DisplayHardware/Hal.h"

#include "DisplayHardware/PowerAdvisor.h"

#include "FrontEnd/FrontEndDisplayInfo.h"

#include "FrontEnd/DisplayInfo.h"

#include "Scheduler/RefreshRateSelector.h"

#include "ThreadContext.h"

#include "TracedOrdinal.h"
@@ -167,7 +167,7 @@ public: 
    void setDisplayName(const std::string& displayName);

    const std::string& getDisplayName() const { return mDisplayName; }



    surfaceflinger::FrontEndDisplayInfo getFrontEndInfo() const;

    surfaceflinger::frontend::DisplayInfo getFrontEndInfo() const;



    /* ------------------------------------------------------------------------

     * Display power mode management.

services/surfaceflinger/FrontEnd/FrontEndDisplayInfo.h→services/surfaceflinger/FrontEnd/DisplayInfo.h

+3 −4
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ 


#include <gui/DisplayInfo.h>



// TODO (b/259553365) fix namespace to be consistent with other components

namespace android::surfaceflinger {

namespace android::surfaceflinger::frontend {



// Display information needed to populate input and calculate layer geometry.

struct FrontEndDisplayInfo {

struct DisplayInfo {

    gui::DisplayInfo info;

    ui::Transform transform;

    bool receivesInput;
@@ -32,4 +31,4 @@ struct FrontEndDisplayInfo { 
    ui::Transform::RotationFlags rotationFlags;

};



} // namespace android::surfaceflinger
 
} // namespace android::surfaceflinger::frontend

services/surfaceflinger/FrontEnd/TransactionHandler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include "TransactionHandler.h"



namespace android {

namespace android::surfaceflinger::frontend {



void TransactionHandler::queueTransaction(TransactionState&& state) {

    mLocklessTransactionQueue.push(std::move(state));
@@ -186,4 +186,4 @@ void TransactionHandler::removeFromStalledTransactions(uint64_t id) { 
        mStalledTransactions.erase(it);

    }

}

} // namespace android
 
} // namespace android::surfaceflinger::frontend

services/surfaceflinger/FrontEnd/TransactionHandler.h

+6 −5
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 


#include <semaphore.h>

#include <cstdint>

#include <mutex>

#include <queue>

#include <thread>

#include <vector>



#include <LocklessQueue.h>
@@ -30,6 +27,10 @@ 
#include <ftl/small_vector.h>



namespace android {



class TestableSurfaceFlinger;

namespace surfaceflinger::frontend {



class TransactionHandler {

public:

    struct TransactionFlushState {
@@ -60,7 +61,7 @@ public: 


private:

    // For unit tests

    friend class TestableSurfaceFlinger;

    friend class ::android::TestableSurfaceFlinger;



    int flushPendingTransactionQueues(std::vector<TransactionState>&, TransactionFlushState&);

    TransactionReadiness applyFilters(TransactionFlushState&);
@@ -71,5 +72,5 @@ private: 
    ftl::SmallVector<TransactionFilter, 2> mTransactionReadyFilters;

    std::vector<uint64_t> mStalledTransactions;

};



} // namespace surfaceflinger::frontend

} // namespace android