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

Commit 69adc817 authored by Danesh M's avatar Danesh M Committed by Gerrit Code Review
Browse files

Revert "Customize regulatory info." 

This reverts commit 3d299959.

This breaks on the dialer shotcode to access this (*#07#)

CYNGNOS-2050

Change-Id: Ia02512642307b25e9ff7e8c0533da5eaa7233a7f
(cherry picked from commit 8fd9afd7)
parent 0668e9ff

AndroidManifest.xml

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

                  android:label="@string/regulatory_information"

                  android:taskAffinity=""

                  android:enabled="true">

                  android:enabled="@bool/config_show_regulatory_info">

            <intent-filter>

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

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

src/com/android/settings/DeviceInfoSettings.java

+2 −3
Original line number Diff line number Diff line
@@ -209,10 +209,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        // Remove manual entry if none present.

        removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual);



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

        // Remove regulatory information if none present

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

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

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

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

            Preference pref = findPreference(KEY_REGULATORY_INFO);

            if (pref != null) {

                getPreferenceScreen().removePreference(pref);