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

Commit bb2223ef authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Skip tests when the drm scheme is not installed" into oc-dev am: fdde895c 

am: 09e8fb09

Change-Id: I2f1ff0469264c3611ab6e19d3b69a3b9d9c0f659
parents c6c389f7 09e8fb09

drm/1.0/vts/functional/drm_hal_vendor_module_api.h

+9 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ DrmHalVTSVendorModule* vendorModuleFactory(); 


class DrmHalVTSVendorModule {

   public:

    DrmHalVTSVendorModule() {}

    DrmHalVTSVendorModule() : installed(true) {}

    virtual ~DrmHalVTSVendorModule() {}



    /**
@@ -89,7 +89,15 @@ class DrmHalVTSVendorModule { 
     */

    virtual std::string getServiceName() const = 0;



    /**

     * Set a flag in the vendor module to indicate whether or not the drm

     * scheme corresponding to this module is installed on the device.

     */

    void setInstalled(bool flag) {installed = flag;}

    bool isInstalled() const {return installed;}



   private:

    bool installed;

    DrmHalVTSVendorModule(const DrmHalVTSVendorModule&) = delete;

    void operator=(const DrmHalVTSVendorModule&) = delete;

};

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

+79 −2

File changed.

Preview size limit exceeded, changes collapsed.