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

Commit 05c99363 authored by Tim Van Patten's avatar Tim Van Patten Committed by Android (Google) Code Review
Browse files

Merge changes I9cbacad2,I98f26bad into main 

* changes:
  FeatureOverrides: Remove copy constructor
  gpuservice: Fix FeatureOverrides std::map crash
parents b18c8f50 0827e1d0

libs/graphicsenv/FeatureOverrides.cpp

+3 −0
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ status_t FeatureOverrides::writeToParcel(Parcel* parcel) const { 
status_t FeatureOverrides::readFromParcel(const Parcel* parcel) {

    status_t status;



    mGlobalFeatures.clear();

    mPackageFeatures.clear();



    // Number of global feature configs.

    status = parcel->resizeOutVector(&mGlobalFeatures);

    if (status != OK) {

libs/graphicsenv/GraphicsEnv.cpp

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ void GraphicsEnv::updateAngleFeatureOverrides() { 
        return;

    }



    mFeatureOverrides = gpuService->getFeatureOverrides();

    gpuService->getFeatureOverrides(mFeatureOverrides);

}



void GraphicsEnv::getAngleFeatureOverrides(std::vector<const char*>& enabled,

libs/graphicsenv/IGpuService.cpp

+8 −6
Original line number Diff line number Diff line
@@ -132,19 +132,21 @@ public: 
        return driverPath;

    }



    FeatureOverrides getFeatureOverrides() override {

    void getFeatureOverrides(FeatureOverrides& featureOverrides) override {

        Parcel data, reply;

        data.writeInterfaceToken(IGpuService::getInterfaceDescriptor());



        FeatureOverrides featureOverrides;

        status_t error =

                remote()->transact(BnGpuService::GET_FEATURE_CONFIG_OVERRIDES, data, &reply);

        if (error != OK) {

            return featureOverrides;

            return;

        }



        featureOverrides.readFromParcel(&reply);

        return featureOverrides;

        error = featureOverrides.readFromParcel(&reply);

        if (error != OK) {

            ALOGE("Failed to read FeatureOverrides from parcel: error = %d", error);

            return;

        }

    }

};
@@ -309,7 +311,7 @@ status_t BnGpuService::onTransact(uint32_t code, const Parcel& data, Parcel* rep 


            // Get the FeatureOverrides from gpuservice, which implements the IGpuService interface

            // with GpuService::getFeatureOverrides().

            FeatureOverrides featureOverrides = getFeatureOverrides();

            const FeatureOverrides& featureOverrides = getCachedFeatureOverrides();

            featureOverrides.writeToParcel(reply);

            return OK;

        }

libs/graphicsenv/include/graphicsenv/FeatureOverrides.h

+5 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public: 
class FeatureOverrides : public Parcelable {

public:

    FeatureOverrides() = default;

    FeatureOverrides(const FeatureOverrides&) = default;

    FeatureOverrides(const FeatureOverrides&) = delete;

    virtual ~FeatureOverrides() = default;

    virtual status_t writeToParcel(Parcel* parcel) const;

    virtual status_t readFromParcel(const Parcel* parcel);
@@ -56,4 +56,8 @@ public: 
    std::map<std::string, std::vector<FeatureConfig>> mPackageFeatures;

};



// Assert that FeatureOverrides is NOT copy-constructible

static_assert(!std::is_copy_constructible<FeatureOverrides>::value,

              "FeatureOverrides should not be copy-constructible!");



} // namespace android

libs/graphicsenv/include/graphicsenv/IGpuService.h

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 
    virtual std::string getPersistGraphicsEgl() = 0;



    // Get the list of features to override.

    virtual FeatureOverrides getFeatureOverrides() = 0;

    virtual void getFeatureOverrides(FeatureOverrides& featureOverrides) = 0;

};



class BnGpuService : public BnInterface<IGpuService> {
@@ -84,6 +84,7 @@ public: 


protected:

    virtual status_t shellCommand(int in, int out, int err, std::vector<String16>& args) = 0;

    virtual const FeatureOverrides& getCachedFeatureOverrides() = 0;

};



} // namespace android