Merge QD4A.200805.003.
Bug: 160260413
Change-Id: Ia5b4cd8b3e4f152ccc4115294147dccfa6514b87
diff --git a/display_defaults.go b/display_defaults.go
index 84d06df..2a32280 100644
--- a/display_defaults.go
+++ b/display_defaults.go
@@ -1,8 +1,8 @@
package display
import (
- "android/soong/android"
- "android/soong/cc"
+ "android/soong/android"
+ "android/soong/cc"
"github.com/google/blueprint/proptools"
)
@@ -11,7 +11,7 @@
android.RegisterModuleType("display_go_defaults_sm7150", display_DefaultsFactory)
}
-func display_DefaultsFactory() (android.Module) {
+func display_DefaultsFactory() android.Module {
module := cc.DefaultsFactory()
android.AddLoadHook(module, display_Defaults)
return module
@@ -26,7 +26,7 @@
ctx.AppendProperties(p)
}
-func display_globalDefaults(ctx android.BaseContext) (*bool) {
+func display_globalDefaults(ctx android.LoadHookContext) *bool {
var module_enabled *bool
if android.ExistentPathForSource(ctx, "vendor/qcom/sm7150/codeaurora/commonsys-intf/display/Android.bp").Valid() == false {
@@ -35,4 +35,3 @@
return module_enabled
}
-
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index 6f23493..5bd97cd 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -43,8 +43,8 @@
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) \
- system/core/libion/include \
- system/core/libion/kernel-headers \
+ system/memory/libion/include \
+ system/memory/libion/kernel-headers \
$(kernel_includes)
LOCAL_HEADER_LIBRARIES := display_headers
diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index 3628bce..d99be21 100644
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -147,7 +147,8 @@
}
DLOGV_IF(kTagCompManager, "Registered displays [%s], configured displays [%s], display %d-%d",
- StringDisplayList(registered_displays_), StringDisplayList(configured_displays_),
+ StringDisplayList(registered_displays_).c_str(),
+ StringDisplayList(configured_displays_).c_str(),
display_comp_ctx->display_id, display_comp_ctx->display_type);
return kErrorNone;
@@ -178,7 +179,8 @@
}
DLOGV_IF(kTagCompManager, "Registered displays [%s], configured displays [%s], display %d-%d",
- StringDisplayList(registered_displays_), StringDisplayList(configured_displays_),
+ StringDisplayList(registered_displays_).c_str(),
+ StringDisplayList(configured_displays_).c_str(),
display_comp_ctx->display_id, display_comp_ctx->display_type);
delete display_comp_ctx;
@@ -404,7 +406,8 @@
error = resource_intf_->Stop(display_resource_ctx, hw_layers);
DLOGV_IF(kTagCompManager, "Registered displays [%s], configured displays [%s], display %d-%d",
- StringDisplayList(registered_displays_), StringDisplayList(configured_displays_),
+ StringDisplayList(registered_displays_).c_str(),
+ StringDisplayList(configured_displays_).c_str(),
display_comp_ctx->display_id, display_comp_ctx->display_type);
return error;
@@ -563,7 +566,7 @@
Purge(display_ctx);
configured_displays_.erase(display_comp_ctx->display_id);
DLOGV_IF(kTagCompManager, "Configured displays = [%s]",
- StringDisplayList(configured_displays_));
+ StringDisplayList(configured_displays_).c_str());
powered_on_displays_.erase(display_comp_ctx->display_id);
break;
@@ -602,7 +605,7 @@
return kErrorNone;
}
-const char *CompManager::StringDisplayList(const std::set<int32_t> &displays) {
+std::string CompManager::StringDisplayList(const std::set<int32_t> &displays) {
std::string displays_str;
for (auto disps : displays) {
if (displays_str.empty()) {
@@ -611,7 +614,7 @@
displays_str += ", " + std::to_string(disps);
}
}
- return displays_str.c_str();
+ return displays_str;
}
DisplayError CompManager::SetBlendSpace(Handle display_ctx, const PrimariesTransfer &blend_space) {
diff --git a/sdm/libs/core/comp_manager.h b/sdm/libs/core/comp_manager.h
index 6cfa2fe..b3d68f1 100644
--- a/sdm/libs/core/comp_manager.h
+++ b/sdm/libs/core/comp_manager.h
@@ -30,6 +30,7 @@
#include <utils/locker.h>
#include <bitset>
#include <set>
+#include <string>
#include <vector>
#include "strategy.h"
@@ -92,7 +93,7 @@
void PrepareStrategyConstraints(Handle display_ctx, HWLayers *hw_layers);
void UpdateStrategyConstraints(bool is_primary, bool disabled);
- const char *StringDisplayList(const std::set<int32_t> &displays);
+ std::string StringDisplayList(const std::set<int32_t> &displays);
struct DisplayCompositionContext {
Strategy *strategy = NULL;
