diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-26 17:04:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-26 17:04:42 -0800 |
| commit | b08b43ff0b8663589f0e4cd70adfe8cfde780a4b (patch) | |
| tree | ee7f4ef698d901aa07dc6b44797d9905287e542c | |
| parent | 3394427d7aa2eeb7c34860a38a0d822dc23a85db (diff) | |
| parent | 1738441b4d00456f4d6d868b6c1a618c0a2585b8 (diff) | |
| download | display-b08b43ff0b8663589f0e4cd70adfe8cfde780a4b.tar.gz | |
Merge "sdm: Fix vector initialization"
| -rw-r--r-- | sdm/libs/hwc/hwc_display_primary.cpp | 4 | ||||
| -rw-r--r-- | sdm/libs/hwc/hwc_session.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sdm/libs/hwc/hwc_display_primary.cpp b/sdm/libs/hwc/hwc_display_primary.cpp index d12897e6..8b0a6f2b 100644 --- a/sdm/libs/hwc/hwc_display_primary.cpp +++ b/sdm/libs/hwc/hwc_display_primary.cpp @@ -211,7 +211,7 @@ int HWCDisplayPrimary::Prepare(hwc_display_contents_1_t *content_list) { DisplayConfigFixedInfo display_config; display_intf_->GetConfig(&display_config); if (display_config.is_cmdmode) { - DLOGI("Skipping null commit on cmd mode panel"); + DLOGV("Skipping null commit on cmd mode panel"); } else { flush_ = true; } @@ -232,7 +232,7 @@ int HWCDisplayPrimary::Commit(hwc_display_contents_1_t *content_list) { DisplayConfigFixedInfo display_config; display_intf_->GetConfig(&display_config); if (content_list->numHwLayers <= 1 && display_config.is_cmdmode) { - DLOGI("Skipping null commit on cmd mode panel"); + DLOGV("Skipping null commit on cmd mode panel"); return 0; } diff --git a/sdm/libs/hwc/hwc_session.cpp b/sdm/libs/hwc/hwc_session.cpp index ff6b2a78..27745d06 100644 --- a/sdm/libs/hwc/hwc_session.cpp +++ b/sdm/libs/hwc/hwc_session.cpp @@ -1222,7 +1222,7 @@ android::status_t HWCSession::GetHdrCapabilities(const android::Parcel *input_pa return 0; } - std::vector<int32_t> supported_hdr_types = {}; + std::vector<int32_t> supported_hdr_types; // Only HDR10 supported now, in future add other supported HDR formats(HLG, DolbyVision) supported_hdr_types.push_back(HAL_HDR_HDR10); |