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

Commit bcf069ed authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Customize regulatory info."

parents b17d7c45 3d299959

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2429,7 +2429,7 @@ 
        <activity android:name="RegulatoryInfoDisplayActivity"

                  android:label="@string/regulatory_information"

                  android:taskAffinity=""

                  android:enabled="@bool/config_show_regulatory_info">

                  android:enabled="true">

            <intent-filter>

                <action android:name="android.settings.SHOW_REGULATORY_INFO" />

                <category android:name="android.intent.category.DEFAULT" />

src/com/android/settings/DeviceInfoSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -180,9 +180,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,

                R.bool.config_additional_system_update_setting_enable);



        // Remove regulatory information if none present.

        // Remove regulatory information if none present or config_show_regulatory_info is disabled

        final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);

        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {

        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()

                || !getResources().getBoolean(R.bool.config_show_regulatory_info)) {

            Preference pref = findPreference(KEY_REGULATORY_INFO);

            if (pref != null) {

                getPreferenceScreen().removePreference(pref);