1 files changed, 6 insertions, 5 deletions
diff --git a/src/trace_processor/importers/proto/android_probes_module.cc b/src/trace_processor/importers/proto/android_probes_module.cc
index 604741932..559c78eb9 100644
--- a/src/trace_processor/importers/proto/android_probes_module.cc
+++ b/src/trace_processor/importers/proto/android_probes_module.cc
@@ -41,7 +41,9 @@ const char* MapToFriendlyPowerRailName(base::StringView raw) {
     return "cpu.big";
   } else if (raw == "S5M_VDD_INT") {
     return "system.fabric";
-  } else if (raw == "PPVAR_VSYS_PWR_DISP") {
+  } else if (raw == "S10M_VDD_TPU") {
+    return "tpu";
+  } else if (raw == "PPVAR_VSYS_PWR_DISP" || raw == "VSYS_PWR_DISPLAY") {
     return "display";
   } else if (raw == "VSYS_PWR_MODEM") {
     return "modem";
@@ -148,10 +150,9 @@ ModuleResult AndroidProbesModule::TokenizePacket(
     energy->set_timestamp_ms(static_cast<uint64_t>(actual_ts / 1000000));
 
     std::vector<uint8_t> vec = data_packet.SerializeAsArray();
-    std::unique_ptr<uint8_t[]> buffer(new uint8_t[vec.size()]);
-    memcpy(buffer.get(), vec.data(), vec.size());
-    context_->sorter->PushTracePacket(
-        actual_ts, state, TraceBlobView(std::move(buffer), 0, vec.size()));
+    TraceBlob blob = TraceBlob::CopyFrom(vec.data(), vec.size());
+    context_->sorter->PushTracePacket(actual_ts, state,
+                                      TraceBlobView(std::move(blob)));
   }
 
   return ModuleResult::Handled();