summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/deviceinfo
diff options
context:
space:
mode:
authorWink Saville <>2009-04-02 01:37:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-02 01:37:03 -0700
commitf9e024198d3b16454287888bd5d40fee23390d23 (patch)
tree111fcc6911cc13c20c271ce793b7124a55fba0dd /src/com/android/settings/deviceinfo
parentb20dd917e2d29045225985baa980a2a8e22e10fc (diff)
downloadpackages_apps_Settings-f9e024198d3b16454287888bd5d40fee23390d23.tar.gz
packages_apps_Settings-f9e024198d3b16454287888bd5d40fee23390d23.tar.bz2
packages_apps_Settings-f9e024198d3b16454287888bd5d40fee23390d23.zip
AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r--src/com/android/settings/deviceinfo/Status.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 9162d25d1..839e712d9 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -50,7 +50,7 @@ import java.lang.ref.WeakReference;
* # Phone Number
* # Network
* # Roaming
- * # IMEI
+ * # Device Id (IMEI in GSM and MEID in CDMA)
* # Network type
* # Signal Strength
* # Battery Strength : TODO
@@ -181,7 +181,9 @@ public class Status extends PreferenceActivity {
mSignalStrength = findPreference("signal_strength");
mUptime = findPreference("up_time");
+ //NOTE "imei" is the "Device ID" since it represents the IMEI in GSM and the MEID in CDMA
setSummaryText("imei", mPhone.getDeviceId());
+
setSummaryText("imei_sv",
((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
.getDeviceSoftwareVersion());
@@ -379,3 +381,5 @@ public class Status extends PreferenceActivity {
return h + ":" + pad(m) + ":" + pad(s);
}
}
+
+