Snap for 10453563 from 6d28abb49625745335bfa37dc3d0e704b21cd5f3 to mainline-uwb-releaseaml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-release

Change-Id: I245ada7adcaf8d79518c2962e38da83be48870ff

1 files changed, 15 insertions, 9 deletions

diff --git a/test/hwcaps_for_testing.cc b/test/hwcaps_for_testing.cc
index a8086a0..fc0013d 100644
--- a/test/hwcaps_for_testing.cc
+++ b/test/hwcaps_for_testing.cc
@@ -22,25 +22,31 @@ namespace cpu_features {
 
 namespace {
 static auto* const g_hardware_capabilities = new HardwareCapabilities();
-static auto* const g_platform_types = new PlatformType();
+static const char* g_platform_pointer = nullptr;
+static const char* g_base_platform_pointer = nullptr;
 }  // namespace
 
 void SetHardwareCapabilities(uint32_t hwcaps, uint32_t hwcaps2) {
   g_hardware_capabilities->hwcaps = hwcaps;
   g_hardware_capabilities->hwcaps2 = hwcaps2;
 }
+void SetPlatformPointer(const char* string) { g_platform_pointer = string; }
+void SetBasePlatformPointer(const char* string) {
+  g_base_platform_pointer = string;
+}
+
+void ResetHwcaps() {
+  SetHardwareCapabilities(0, 0);
+  SetPlatformPointer(nullptr);
+  SetBasePlatformPointer(nullptr);
+}
 
 HardwareCapabilities CpuFeatures_GetHardwareCapabilities(void) {
   return *g_hardware_capabilities;
 }
-
-void SetPlatformTypes(const char* platform, const char* base_platform) {
-  CpuFeatures_StringView_CopyString(str(platform), g_platform_types->platform,
-                                    sizeof(g_platform_types->platform));
-  CpuFeatures_StringView_CopyString(str(base_platform),
-                                    g_platform_types->base_platform,
-                                    sizeof(g_platform_types->base_platform));
+const char* CpuFeatures_GetPlatformPointer(void) { return g_platform_pointer; }
+const char* CpuFeatures_GetBasePlatformPointer(void) {
+  return g_base_platform_pointer;
 }
 
-PlatformType CpuFeatures_GetPlatformType(void) { return *g_platform_types; }
 }  // namespace cpu_features