PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Browse Source 
Automated import of CL 144245
This commit is contained in:
Wink Saville
2009-04-02 11:00:56 -07:00
committed by The Android Open Source Project
parent 0e2016789e
commit c38866843e
8 changed files with 109 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/Status.java
View File

@@ -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);
}
}