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

Commit eb6540a7 authored by Jin Qian's avatar Jin Qian Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore""

parents 84e9b09f 2877c167

configstore/1.0/ISurfaceFlingerConfigs.hal

+0 −8
Original line number Diff line number Diff line
@@ -96,12 +96,4 @@ interface ISurfaceFlingerConfigs { 
     * mechanism which significantly reduces buffer processing latency.

     */

    hasSyncFramework() generates(OptionalBool value);



    /*

     * Return true if surface flinger should use vr flinger for compatible vr

     * apps, false otherwise. Devices that will never be running vr apps should

     * return false to avoid extra resource usage. Daydream ready devices must

     * return true for full vr support.

     */

    useVrFlinger() generates (OptionalBool value);

};

configstore/1.0/default/SurfaceFlingerConfigs.cpp

+0 −12
Original line number Diff line number Diff line
@@ -111,18 +111,6 @@ Return<void> SurfaceFlingerConfigs::maxVirtualDisplaySize(maxVirtualDisplaySize_ 
  return Void();

}



Return<void> SurfaceFlingerConfigs::useVrFlinger(useVrFlinger_cb _hidl_cb) {

    bool value = false;

    bool specified = false;

#ifdef USE_VR_FLINGER

    value = true;

    specified = true;

#endif

    _hidl_cb({specified, value});

    LOG(INFO) << "SurfaceFlinger UseVrFlinger: " << (value ? "true" : "false");

    return Void();

}



// Methods from ::android::hidl::base::V1_0::IBase follow.

ISurfaceFlingerConfigs* HIDL_FETCH_ISurfaceFlingerConfigs(const char* /* name */) {

    return new SurfaceFlingerConfigs();

configstore/1.0/default/SurfaceFlingerConfigs.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct SurfaceFlingerConfigs : public ISurfaceFlingerConfigs { 
    Return<void> useHwcForRGBtoYUV(useHwcForRGBtoYUV_cb _hidl_cb) override;

    Return<void> maxVirtualDisplaySize(maxVirtualDisplaySize_cb _hidl_cb) override;

    Return<void> hasSyncFramework(hasSyncFramework_cb _hidl_cb) override;

    Return<void> useVrFlinger(useVrFlinger_cb _hidl_cb) override;



    // Methods from ::android::hidl::base::V1_0::IBase follow.

configstore/1.0/default/surfaceflinger.mk

+0 −4
Original line number Diff line number Diff line
@@ -46,7 +46,3 @@ endif 
ifeq ($(TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK),true)

    LOCAL_CFLAGS += -DRUNNING_WITHOUT_SYNC_FRAMEWORK

endif
 


ifneq ($(USE_VR_FLINGER),)

    LOCAL_CFLAGS += -DUSE_VR_FLINGER

endif