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

Commit 32295332 authored by Brian Johnson's avatar Brian Johnson Committed by Android (Google) Code Review
Browse files

Merge "SF: Add a flag for the connected-display feature" into main

parents 606772f9 c99f638c

services/surfaceflinger/SurfaceFlinger.cpp

+4 −0
Original line number Diff line number Diff line
@@ -494,7 +494,9 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
    mLegacyFrontEndEnabled = !mLayerLifecycleManagerEnabled ||

            base::GetBoolProperty("persist.debug.sf.enable_legacy_frontend"s, false);



    // Trunk-Stable flags

    mMiscFlagValue = flags::misc1();

    mConnectedDisplayFlagValue = flags::connected_display();

}



LatchUnsignaledConfig SurfaceFlinger::getLatchUnsignaledConfig() {
@@ -6342,6 +6344,8 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, const std::string& comp 
    colorizer.reset(result);



    StringAppendF(&result, "MiscFlagValue: %s\n", mMiscFlagValue ? "true" : "false");

    StringAppendF(&result, "ConnectedDisplayFlagValue: %s\n",

                  mConnectedDisplayFlagValue ? "true" : "false");



    getRenderEngine().dump(result);

services/surfaceflinger/SurfaceFlinger.h

+2 −0
Original line number Diff line number Diff line
@@ -1451,7 +1451,9 @@ private: 
    void sfdo_scheduleComposite();

    void sfdo_scheduleCommit();



    // Trunk-Stable flags

    bool mMiscFlagValue;

    bool mConnectedDisplayFlagValue;

};



class SurfaceComposerAIDL : public gui::BnSurfaceComposer {

services/surfaceflinger/surfaceflinger_flags.aconfig

+9 −1
Original line number Diff line number Diff line
@@ -7,3 +7,11 @@ flag { 
  bug: "297389311"

  is_fixed_read_only: true

}



flag {

  name: "connected_display"

  namespace: "core_graphics"

  description: "Controls SurfaceFlinger support for Connected Displays"

  bug: "278199093"

  is_fixed_read_only: true

}