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

Commit 6965a791 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12283639 from 73bd9d2b to 24Q4-release 

Change-Id: I48c5b1d55931df2ef49d59f62a9239df4c05c095
parents 229121e0 73bd9d2b

cmds/installd/tests/installd_dexopt_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ TEST_F(ProfileTest, CopySystemProfileFailWrongProfileName) { 


class BootProfileTest : public ProfileTest {

  public:

    std::vector<const std::string> extra_apps_;

    std::vector<std::string> extra_apps_;

    std::vector<int64_t> extra_ce_data_inodes_;



    virtual void SetUp() {

include/audiomanager/IAudioManager.h

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
namespace android {



// ----------------------------------------------------------------------------



// TODO(b/309532236) replace this class with AIDL generated parcelable

class IAudioManager : public IInterface

{

public:
@@ -43,6 +43,7 @@ public: 
        RELEASE_RECORDER                      = IBinder::FIRST_CALL_TRANSACTION + 6,

        PLAYER_SESSION_ID                     = IBinder::FIRST_CALL_TRANSACTION + 7,

        PORT_EVENT                            = IBinder::FIRST_CALL_TRANSACTION + 8,

        PERMISSION_UPDATE_BARRIER             = IBinder::FIRST_CALL_TRANSACTION + 9,

    };



    DECLARE_META_INTERFACE(AudioManager)
@@ -63,6 +64,7 @@ public: 
    /*oneway*/ virtual status_t playerSessionId(audio_unique_id_t piid, audio_session_t sessionId) = 0;

    /*oneway*/ virtual status_t portEvent(audio_port_handle_t portId, player_state_t event,

                const std::unique_ptr<os::PersistableBundle>& extras) = 0;

    virtual status_t permissionUpdateBarrier() = 0;

};



// ----------------------------------------------------------------------------

libs/graphicsenv/GraphicsEnv.cpp

+4 −13
Original line number Diff line number Diff line
@@ -401,18 +401,10 @@ void GraphicsEnv::setDriverToLoad(GpuStatsInfo::Driver driver) { 
    switch (driver) {

        case GpuStatsInfo::Driver::GL:

        case GpuStatsInfo::Driver::GL_UPDATED:

        case GpuStatsInfo::Driver::ANGLE: {

            if (mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::NONE ||

                mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::GL) {

        case GpuStatsInfo::Driver::ANGLE:

            mGpuStats.glDriverToLoad = driver;

            break;

            }



            if (mGpuStats.glDriverFallback == GpuStatsInfo::Driver::NONE) {

                mGpuStats.glDriverFallback = driver;

            }

            break;

        }

        case GpuStatsInfo::Driver::VULKAN:

        case GpuStatsInfo::Driver::VULKAN_UPDATED: {

            if (mGpuStats.vkDriverToLoad == GpuStatsInfo::Driver::NONE ||
@@ -561,8 +553,7 @@ void GraphicsEnv::sendGpuStatsLocked(GpuStatsInfo::Api api, bool isDriverLoaded, 
    bool isIntendedDriverLoaded = false;

    if (api == GpuStatsInfo::Api::API_GL) {

        driver = mGpuStats.glDriverToLoad;

        isIntendedDriverLoaded =

                isDriverLoaded && (mGpuStats.glDriverFallback == GpuStatsInfo::Driver::NONE);

        isIntendedDriverLoaded = isDriverLoaded;

    } else {

        driver = mGpuStats.vkDriverToLoad;

        isIntendedDriverLoaded =

libs/graphicsenv/OWNERS

+9 −2
Original line number Diff line number Diff line 
chrisforbes@google.com

cnorthrop@google.com

ianelliott@google.com

lpy@google.com
 


abdolrashidi@google.com

cclao@google.com

cnorthrop@google.com

hibrian@google.com

mathias@google.com

romanl@google.com

solti@google.com

yuxinhu@google.com

libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ public: 
    std::string appPackageName = "";

    int32_t vulkanVersion = 0;

    Driver glDriverToLoad = Driver::NONE;

    Driver glDriverFallback = Driver::NONE;

    Driver vkDriverToLoad = Driver::NONE;

    Driver vkDriverFallback = Driver::NONE;

    bool glDriverToSend = false;