remove defaulting to no errors

project-chip · Jun 29, 2023 · 1189788 · 1189788
1 parent a39e88a
commit 1189788
Showing 1 changed file with 0 additions and 44 deletions.
diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp
@@ -170,15 +170,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
@@ -194,13 +185,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;
  }
@@ -210,13 +194,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;
  }
@@ -226,13 +203,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;
  }
@@ -242,13 +212,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;
  }
@@ -258,13 +221,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;
  }