merge in jb-release history after reset to jb-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c2d7110..744a814 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1768,8 +1768,6 @@
<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-->
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index b156c11..93347c6 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -100,12 +100,6 @@
style="?android:preferenceInformationStyle"
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"
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 7d8b805..c25a466 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -59,8 +59,6 @@
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];
@@ -74,8 +72,6 @@
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());
@@ -83,10 +79,6 @@
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));