diff options
Diffstat (limited to 'src/com/android/settings/DeviceInfoSettings.java')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index d041c05..76f5a8e 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -40,7 +40,7 @@ import java.util.regex.Pattern; public class DeviceInfoSettings extends SettingsPreferenceFragment { - private static final String TAG = "DeviceInfoSettings"; + private static final String LOG_TAG = "DeviceInfoSettings"; private static final String KEY_CONTAINER = "container"; private static final String KEY_TEAM = "team"; @@ -55,8 +55,6 @@ 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]; @@ -80,7 +78,6 @@ 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()); @@ -89,11 +86,6 @@ 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)); @@ -136,6 +128,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { try { startActivity(intent); } catch (Exception e) { + Log.e(LOG_TAG, "Unable to start activity " + intent.toString()); } } } @@ -150,7 +143,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { try { preferenceGroup.removePreference(findPreference(preference)); } catch (RuntimeException e) { - Log.d(TAG, "Property '" + property + "' missing and no '" + Log.d(LOG_TAG, "Property '" + property + "' missing and no '" + preference + "' preference"); } } @@ -171,7 +164,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { SystemProperties.get(property, getResources().getString(R.string.device_info_default))); } catch (RuntimeException e) { - + // No recovery } } @@ -200,10 +193,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { Matcher m = p.matcher(procVersionStr); if (!m.matches()) { - Log.e(TAG, "Regex did not match on /proc/version: " + procVersionStr); + Log.e(LOG_TAG, "Regex did not match on /proc/version: " + procVersionStr); return "Unavailable"; } else if (m.groupCount() < 4) { - Log.e(TAG, "Regex match on /proc/version only returned " + m.groupCount() + Log.e(LOG_TAG, "Regex match on /proc/version only returned " + m.groupCount() + " groups"); return "Unavailable"; } else { @@ -212,7 +205,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { .append(m.group(4))).toString(); } } catch (IOException e) { - Log.e(TAG, + Log.e(LOG_TAG, "IO Exception when getting kernel version for Device Info screen", e); |