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

Commit be584708 authored by John Wang's avatar John Wang Committed by The Android Automerger
Browse files

Display FCC id for LTE in Settings. 

If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
parent e4130196

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1768,6 +1768,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-->

    <string name="fcc_equipment_id">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

+6 −0
Original line number Diff line number Diff line
@@ -101,6 +101,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
@@ -59,6 +59,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
    private static final String KEY_BASEBAND_VERSION = "baseband_version";

    private static final String KEY_FIRMWARE_VERSION = "firmware_version";

    private static final String KEY_UPDATE_SETTING = "additional_system_update_settings";

    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];
@@ -72,6 +74,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
        findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);

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

        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL + getMsvSuffix());

        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());
@@ -79,6 +83,10 @@ 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(getActivity())) {

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