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

Commit b1e29aff authored by Karthik Ravi Shankar's avatar Karthik Ravi Shankar Committed by android-build-merger
Browse files

Merge "Add VrFlinger dumpsys to SurfaceFlinger" into oc-dr1-dev am: ae11e71b 

am: 9579e3cd

Change-Id: I3f56806205f651d714255c66a1b1bd8e0cc73f6d
parents 29674ddb 9579e3cd

libs/vr/libvrflinger/include/dvr/vr_flinger.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,9 @@ class VrFlinger { 
  // Called on a binder thread.

  // Called on a binder thread.

  void OnHardwareComposerRefresh();

  void OnHardwareComposerRefresh();





  // dump all vr flinger state.

  std::string Dump();



 private:

 private:

  VrFlinger();

  VrFlinger();

  bool Init(Hwc2::Composer* hidl,

  bool Init(Hwc2::Composer* hidl,

libs/vr/libvrflinger/vr_flinger.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -137,6 +137,11 @@ void VrFlinger::OnHardwareComposerRefresh() { 
  display_service_->OnHardwareComposerRefresh();

  display_service_->OnHardwareComposerRefresh();

}

}





std::string VrFlinger::Dump() {

  // TODO(karthikrs): Add more state information here.

  return display_service_->DumpState(0/*unused*/);

}



void VrFlinger::PersistentVrStateCallback::onPersistentVrStateChanged(

void VrFlinger::PersistentVrStateCallback::onPersistentVrStateChanged(

    bool enabled) {

    bool enabled) {

  ALOGV("Notified persistent vr mode is %s", enabled ? "on" : "off");

  ALOGV("Notified persistent vr mode is %s", enabled ? "on" : "off");
@@ -144,6 +149,5 @@ void VrFlinger::PersistentVrStateCallback::onPersistentVrStateChanged( 
  // Persistent VR mode is not enough.

  // Persistent VR mode is not enough.

  // request_display_callback_(enabled);

  // request_display_callback_(enabled);

}

}



}  // namespace dvr

}  // namespace dvr

}  // namespace android
 
}  // namespace android

services/surfaceflinger/SurfaceFlinger.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -3769,6 +3769,15 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, 
     */

     */

    const GraphicBufferAllocator& alloc(GraphicBufferAllocator::get());

    const GraphicBufferAllocator& alloc(GraphicBufferAllocator::get());

    alloc.dump(result);

    alloc.dump(result);



    /*

     * Dump VrFlinger state if in use.

     */

    if (mVrFlingerRequestsDisplay && mVrFlinger) {

        result.append("VrFlinger state:\n");

        result.append(mVrFlinger->Dump().c_str());

        result.append("\n");

    }

}

}





const Vector< sp<Layer> >&

const Vector< sp<Layer> >&