From bb85f4383218defbd6c2c9fefee6cc6f8a99af96 Mon Sep 17 00:00:00 2001
From: pankore <86098180+pankore@users.noreply.github.com>
Date: Wed, 22 Mar 2023 18:42:46 +0800
Subject: [PATCH] remove defaulting to no errors

---
 .../basic-information/basic-information.cpp   | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp
index 3e98375670d513..e4d2dea5c0e214 100644
--- a/src/app/clusters/basic-information/basic-information.cpp
+++ b/src/app/clusters/basic-information/basic-information.cpp
@@ -169,15 +169,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         status =
             GetDeviceInstanceInfoProvider()->GetManufacturingDate(manufacturingYear, manufacturingMonth, manufacturingDayOfMonth);
 
-        // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
-        if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
-        {
-            manufacturingYear       = 2020;
-            manufacturingMonth      = 1;
-            manufacturingDayOfMonth = 1;
-            status                  = CHIP_NO_ERROR;
-        }
-
         if (status == CHIP_NO_ERROR)
         {
             // Format is YYYYMMDD
@@ -193,13 +184,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         char partNumber[kMaxLen + 1] = { 0 };
         status                       = GetDeviceInstanceInfoProvider()->GetPartNumber(partNumber, sizeof(partNumber));
 
-        // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
-        if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
-        {
-            partNumber[0] = '\0';
-            status        = CHIP_NO_ERROR;
-        }
-
         status = EncodeStringOnSuccess(status, aEncoder, partNumber, kMaxLen);
         break;
     }
@@ -209,13 +193,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         char productUrl[kMaxLen + 1] = { 0 };
         status                       = GetDeviceInstanceInfoProvider()->GetProductURL(productUrl, sizeof(productUrl));
 
-        // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
-        if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
-        {
-            productUrl[0] = '\0';
-            status        = CHIP_NO_ERROR;
-        }
-
         status = EncodeStringOnSuccess(status, aEncoder, productUrl, kMaxLen);
         break;
     }
@@ -225,13 +202,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         char productLabel[kMaxLen + 1] = { 0 };
         status                         = GetDeviceInstanceInfoProvider()->GetProductLabel(productLabel, sizeof(productLabel));
 
-        // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
-        if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
-        {
-            productLabel[0] = '\0';
-            status          = CHIP_NO_ERROR;
-        }
-
         status = EncodeStringOnSuccess(status, aEncoder, productLabel, kMaxLen);
         break;
     }
@@ -241,13 +211,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         char serialNumberString[kMaxLen + 1] = { 0 };
         status = GetDeviceInstanceInfoProvider()->GetSerialNumber(serialNumberString, sizeof(serialNumberString));
 
-        // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
-        if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
-        {
-            serialNumberString[0] = '\0';
-            status                = CHIP_NO_ERROR;
-        }
-
         status = EncodeStringOnSuccess(status, aEncoder, serialNumberString, kMaxLen);
         break;
     }
@@ -257,13 +220,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         char uniqueId[kMaxLen + 1] = { 0 };
         status                     = ConfigurationMgr().GetUniqueId(uniqueId, sizeof(uniqueId));
 
-        // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
-        if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
-        {
-            uniqueId[0] = '\0';
-            status      = CHIP_NO_ERROR;
-        }
-
         status = EncodeStringOnSuccess(status, aEncoder, uniqueId, kMaxLen);
         break;
     }