From 5951efefd779a912711e1bcfc42e7588643097b9 Mon Sep 17 00:00:00 2001 From: Yuchen Date: Wed, 16 Oct 2024 03:03:16 +0000 Subject: [PATCH] Fix name of COO. Test: visual Bug: 370850767 Flag: EXEMPT bug fix Change-Id: I41931b49e993806cc3de71c67f600faee2af241d --- src/com/android/settings/RegulatoryInfoDisplayActivity.kt | 2 +- .../deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt index 6b5ccc79047..4038aa8a43b 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt @@ -69,6 +69,6 @@ class RegulatoryInfoDisplayActivity : Activity() { private fun getRegulatoryText(): CharSequence? { val regulatoryInfoText = resources.getText(R.string.regulatory_info_text) if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText - return featureFactory.hardwareInfoFeatureProvider?.countryIfOriginLabel + return featureFactory.hardwareInfoFeatureProvider?.countryOfOriginLabel } } diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt index e9866d73263..4b2666f1de1 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt @@ -27,5 +27,5 @@ interface HardwareInfoFeatureProvider { /** * The country of origin label. */ - val countryIfOriginLabel: String + val countryOfOriginLabel: String }