From 7c089dbcf991729ea4960695bc144672b6b71b51 Mon Sep 17 00:00:00 2001
From: cranelw <cranelw@chromium.org>
Date: Fri, 16 Aug 2024 04:19:45 +0000
Subject: [PATCH] CRAS: remove nuance-dlc

BUG=b:359496197
TEST=CQ

Disallow-Recycled-Builds: test-failures
Cq-Depend: chromium:5790287
Change-Id: Ic1926401f9193c1477b8fbf2df6604e0844623bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5792815
Reviewed-by: Li-Yu Yu <aaronyu@google.com>
Commit-Queue: Cranel W <cranelw@chromium.org>
Tested-by: chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com <chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com>
---
 cras/server/platform/dlc/dlc.h        | 3 +--
 cras/server/platform/dlc/src/lib.rs   | 5 +----
 cras/src/server/cras_server.c         | 1 -
 cras/src/server/cras_server_metrics.c | 2 --
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/cras/server/platform/dlc/dlc.h b/cras/server/platform/dlc/dlc.h
index 64402e4f5..31fb23f0a 100644
--- a/cras/server/platform/dlc/dlc.h
+++ b/cras/server/platform/dlc/dlc.h
@@ -18,7 +18,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdlib.h>
 
-#define NUM_CRAS_DLCS 4
+#define NUM_CRAS_DLCS 3
 
 #define CRAS_DLC_ID_STRING_MAX_LENGTH 50
 
@@ -28,7 +28,6 @@ extern "C" {
 enum CrasDlcId {
   CrasDlcSrBt,
   CrasDlcNcAp,
-  CrasDlcNuance,
   CrasDlcIntelligoBeamforming,
 };
 
diff --git a/cras/server/platform/dlc/src/lib.rs b/cras/server/platform/dlc/src/lib.rs
index 9b533c751..283d4a588 100644
--- a/cras/server/platform/dlc/src/lib.rs
+++ b/cras/server/platform/dlc/src/lib.rs
@@ -47,7 +47,6 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 pub enum CrasDlcId {
     CrasDlcSrBt,
     CrasDlcNcAp,
-    CrasDlcNuance,
     CrasDlcIntelligoBeamforming,
 }
 
@@ -55,11 +54,10 @@ pub enum CrasDlcId {
 const MANAGED_DLCS: &[CrasDlcId] = &[
     CrasDlcId::CrasDlcSrBt,
     CrasDlcId::CrasDlcNcAp,
-    CrasDlcId::CrasDlcNuance,
     CrasDlcId::CrasDlcIntelligoBeamforming,
 ];
 
-pub const NUM_CRAS_DLCS: usize = 4;
+pub const NUM_CRAS_DLCS: usize = 3;
 // Assert that NUM_CRAS_DLCS is updated.
 // We cannot assign MANAGED_DLCS.len() to NUM_CRAS_DLCS because cbindgen does
 // not seem to understand it.
@@ -73,7 +71,6 @@ impl CrasDlcId {
             // CRAS_DLC_ID_STRING_MAX_LENGTH
             CrasDlcId::CrasDlcSrBt => "sr-bt-dlc",
             CrasDlcId::CrasDlcNcAp => "nc-ap-dlc",
-            CrasDlcId::CrasDlcNuance => "nuance-dlc",
             CrasDlcId::CrasDlcIntelligoBeamforming => "intelligo-beamforming-dlc",
         }
     }
diff --git a/cras/src/server/cras_server.c b/cras/src/server/cras_server.c
index 25e319b17..d905149fa 100644
--- a/cras/src/server/cras_server.c
+++ b/cras/src/server/cras_server.c
@@ -610,7 +610,6 @@ int cras_server_run(unsigned int profile_disable_mask) {
           {
               [CrasDlcSrBt] = cras_system_get_sr_bt_supported(),
               [CrasDlcNcAp] = true,
-              [CrasDlcNuance] = cras_s2_get_style_transfer_supported(),
               [CrasDlcIntelligoBeamforming] =
                   cras_s2_get_beamforming_supported(),
           },
diff --git a/cras/src/server/cras_server_metrics.c b/cras/src/server/cras_server_metrics.c
index 45fbf6315..da33eca99 100644
--- a/cras/src/server/cras_server_metrics.c
+++ b/cras/src/server/cras_server_metrics.c
@@ -427,8 +427,6 @@ static inline const char* metrics_dlc_id_str(enum CrasDlcId dlc_id) {
       return "SrBt";
     case CrasDlcNcAp:
       return "NcAp";
-    case CrasDlcNuance:
-      return "Nuance";
     case CrasDlcIntelligoBeamforming:
       return "IntelligoBeamforming";
     default: