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

Commit ab824c81 authored by John Wang's avatar John Wang Committed by Android Git Automerger
Browse files

am f44308a7: Display FCC id for LTE in Settings. 

* commit 'f44308a7':
  Display FCC id for LTE in Settings.
parents d2157460 f44308a7

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -1520,6 +1520,8 @@ 
    <string name="firmware_version">Android version</string>

    <!-- About phone screen, status item label-->

    <string name="model_number">Model number</string>

    <!-- About phone screen, fcc equipment id label [CHAR LIMIT=30]-->

    <string name="fcc_equipment_id">FCC Equipment ID</string>

    <!-- About phone screen,  setting option name-->

    <string name="baseband_version">Baseband version</string>

    <!-- About phone screen,  setting option name-->

res/xml/device_info_settings.xml

+25 −19
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ 
                android:title="@string/firmware_version"

                android:summary="@string/device_info_default"/>



        <!-- Device FCC equipment id -->

        <Preference android:key="fcc_equipment_id"

                style="?android:preferenceInformationStyle"

                android:title="@string/fcc_equipment_id"

                android:summary="@string/device_info_default"/>



        <!-- Device Baseband version -->

        <Preference android:key="baseband_version"

                style="?android:preferenceInformationStyle"

src/com/android/settings/DeviceInfoSettings.java

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
    private static final String KEY_DEVICE_MODEL = "device_model";

    private static final String KEY_BASEBAND_VERSION = "baseband_version";

    private static final String KEY_FIRMWARE_VERSION = "firmware_version";

    private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";

    private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";



    long[] mHits = new long[3];
@@ -78,6 +80,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
        setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);

        findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);

        setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");

        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);

        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);

        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);

        findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
@@ -86,6 +89,11 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
        removePreferenceIfPropertyMissing(getPreferenceScreen(), "safetylegal",

                PROPERTY_URL_SAFETYLEGAL);



        // Remove Equipment id preference if FCC ID is not set by RIL

        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_EQUIPMENT_ID,

                PROPERTY_EQUIPMENT_ID);





        // Remove Baseband version if wifi-only device

        if (Utils.isWifiOnly()) {

            getPreferenceScreen().removePreference(findPreference(KEY_BASEBAND_VERSION));