Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a876deec authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix name of COO." into main

parents c0b6e0bd 5951efef

src/com/android/settings/RegulatoryInfoDisplayActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -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

    }

}

src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ interface HardwareInfoFeatureProvider { 
    /**

     * The country of origin label.

     */

    val countryIfOriginLabel: String

    val countryOfOriginLabel: String

}