PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix name of COO." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-16 04:36:50 +00:00
committed by Android (Google) Code Review
parent c0b6e0bd4b 5951efefd7
commit a876deec66
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/RegulatoryInfoDisplayActivity.kt
View File

@@ -69,6 +69,6 @@ class RegulatoryInfoDisplayActivity : Activity() {
private fun getRegulatoryText(): CharSequence? { private fun getRegulatoryText(): CharSequence? {
val regulatoryInfoText = resources.getText(R.string.regulatory_info_text) val regulatoryInfoText = resources.getText(R.string.regulatory_info_text)
if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText
return featureFactory.hardwareInfoFeatureProvider?.countryIfOriginLabel return featureFactory.hardwareInfoFeatureProvider?.countryOfOriginLabel
} }
} }

2
src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
View File

@@ -27,5 +27,5 @@ interface HardwareInfoFeatureProvider {
/** /**
* The country of origin label. * The country of origin label.
*/ */
val countryIfOriginLabel: String val countryOfOriginLabel: String
} }