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

Commit f31958f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove access of DisplayClient from vr_wm"

parents 9f7506c3 308ef1a0

services/vr/vr_window_manager/composer/impl/vr_hwc.cpp

+2 −22
Original line number Diff line number Diff line
@@ -312,32 +312,12 @@ Error VrHwc::getDisplayAttribute(Display display, Config config, 
    return Error::BAD_CONFIG;

  }



  int error = 0;

  auto display_client = DisplayClient::Create(&error);

  SystemDisplayMetrics metrics;



  if (error) {

    ALOGE("Could not connect to display service : %s(%d)", strerror(error), error);

  } else {

    error = display_client->GetDisplayMetrics(&metrics);



    if (error) {

      ALOGE("Could not get display metrics from display service : %s(%d)", strerror(error), error);

    }

  }



  if (error) {

    metrics.display_native_width = 1080;

    metrics.display_native_height = 1920;

    ALOGI("Setting display metrics to default : width=%d height=%d", metrics.display_native_width, metrics.display_native_height);

  }



  switch (attribute) {

    case IComposerClient::Attribute::WIDTH:

      *outValue = metrics.display_native_width;

      *outValue = 1080;

      break;

    case IComposerClient::Attribute::HEIGHT:

      *outValue = metrics.display_native_height;

      *outValue = 1920;

      break;

    case IComposerClient::Attribute::VSYNC_PERIOD:

      *outValue = 1000 * 1000 * 1000 / 30;  // 30fps

services/vr/vr_window_manager/surface_flinger_view.cpp

+2 −22
Original line number Diff line number Diff line
@@ -39,29 +39,9 @@ bool SurfaceFlingerView::Initialize(HwcCallback::Client *client) { 
  vr_composer_view_->Initialize(GetComposerViewFromIComposer(

      vr_hwcomposer_.get()));



  int error = 0;

  auto display_client = DisplayClient::Create(&error);

  SystemDisplayMetrics metrics;



  if (error) {

    ALOGE("Could not connect to display service : %s(%d)", strerror(error), error);

  } else {

    error = display_client->GetDisplayMetrics(&metrics);



    if (error) {

      ALOGE("Could not get display metrics from display service : %s(%d)", strerror(error), error);

    }

  }



  if (error) {

    metrics.display_native_height = 1920;

    metrics.display_native_width = 1080;

    ALOGI("Setting display metrics to default : width=%d height=%d", metrics.display_native_height, metrics.display_native_width);

  }



  // TODO(alexst): Refactor ShellView to account for orientation and change this back.

  width_ = metrics.display_native_height;

  height_ = metrics.display_native_width;

  width_ = 1920;

  height_ = 1080;

  return true;

}