commit | a876deec66168bc0dbfc5f2f0dab659b68c8fd70 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 16 04:36:50 2024 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 16 04:36:50 2024 +0000 |
tree | 8974ab84d23121e1536c0814c86c8d4ed8800e13 | |
parent | c0b6e0bd4bcd9dcb7c7c2c0936bc987b852ddcb7 [diff] | |
parent | 5951efefd779a912711e1bcfc42e7588643097b9 [diff] |
Merge "Fix name of COO." into main
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt index 6b5ccc7..4038aa8 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
@@ -69,6 +69,6 @@ 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 e9866d7..4b2666f 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
@@ -27,5 +27,5 @@ /** * The country of origin label. */ - val countryIfOriginLabel: String + val countryOfOriginLabel: String }