Merge changes from topic "presubmit-am-2fdbe572af844efa80b9758765138692" into tm-mainline-prod
* changes:
[automerge] SF: Introduce LayerTraceGenerator 2p: 4df8eb6269
SF: Introduce LayerTraceGenerator
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index f0cf6f4..e7bde21 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -722,7 +722,9 @@
}
}
- {
+ // TODO(b/220095381): Due to boot time regression, we have omitted call to
+ // createAppDirectoryForSupplementalData from here temporarily (unless it's for testing)
+ if (uuid_ != nullptr && strcmp(uuid_, "TEST") == 0) {
auto status = createAppDirectoryForSupplementalData(uuid, packageName, userId, appId,
previousAppId, seInfo, flags);
if (!status.isOk()) {
diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
index 8d67954..cfbdbd1 100644
--- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
@@ -115,7 +115,7 @@
AidlPerFrameMetadataBlob translate(IComposerClient::PerFrameMetadataBlob x) {
AidlPerFrameMetadataBlob blob;
blob.key = translate<AidlPerFrameMetadataKey>(x.key),
- std::copy(blob.blob.begin(), blob.blob.end(), x.blob.begin());
+ std::copy(x.blob.begin(), x.blob.end(), std::inserter(blob.blob, blob.blob.end()));
return blob;
}
diff --git a/services/surfaceflinger/FlagManager.cpp b/services/surfaceflinger/FlagManager.cpp
index e09a192..bd3cf74 100644
--- a/services/surfaceflinger/FlagManager.cpp
+++ b/services/surfaceflinger/FlagManager.cpp
@@ -101,7 +101,6 @@
}
bool FlagManager::use_skia_tracing() const {
- ALOGD("use_skia_tracing ?");
std::optional<bool> sysPropVal =
doParse<bool>(base::GetProperty(PROPERTY_SKIA_ATRACE_ENABLED, "").c_str());
return getValue("SkiaTracingFeature__use_skia_tracing", sysPropVal, false);