diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5cbdaf344a..c5b1e7fa76f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1561,8 +1561,10 @@
MSID
PRL Version
-
- IMEI / MEID
+
+ MEID
+
+ ICCID
Mobile network type
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 369c565faaa..19e22f43822 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,18 +17,48 @@
-
-
-
+
+
+
+
+
+
@@ -50,58 +80,33 @@
android:title="@string/status_meid_number"
android:summary="@string/device_info_not_available"
android:persistent="false" />
-
-
-
-
-
-
-
-
+
@@ -111,7 +116,7 @@
android:summary="@string/device_info_not_available"
android:persistent="false" />
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 68ba3548487..456bc9886cb 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -82,6 +82,7 @@ public class Status extends PreferenceActivity {
private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
private static final String KEY_BT_ADDRESS = "bt_address";
private static final String KEY_SERIAL_NUMBER = "serial_number";
+ private static final String KEY_ICC_ID = "icc_id";
private static final String[] PHONE_RELATED_ENTRIES = {
KEY_DATA_STATE,
@@ -95,7 +96,8 @@ public class Status extends PreferenceActivity {
KEY_PRL_VERSION,
KEY_MIN_NUMBER,
KEY_MEID_NUMBER,
- KEY_SIGNAL_STRENGTH
+ KEY_SIGNAL_STRENGTH,
+ KEY_ICC_ID
};
private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
@@ -111,7 +113,7 @@ public class Status extends PreferenceActivity {
private Preference mUptime;
private static String sUnknown;
-
+
private Preference mBatteryStatus;
private Preference mBatteryLevel;
@@ -150,7 +152,7 @@ public class Status extends PreferenceActivity {
}
private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
-
+
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
@@ -158,9 +160,9 @@ public class Status extends PreferenceActivity {
int level = intent.getIntExtra("level", 0);
int scale = intent.getIntExtra("scale", 100);
-
+
mBatteryLevel.setSummary(String.valueOf(level * 100 / scale) + "%");
-
+
int plugType = intent.getIntExtra("plugged", 0);
int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
String statusString;
@@ -193,7 +195,7 @@ public class Status extends PreferenceActivity {
updateNetworkType();
}
};
-
+
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -231,11 +233,18 @@ public class Status extends PreferenceActivity {
findPreference(KEY_MIN_NUMBER).setTitle(R.string.status_msid_number);
}
setSummaryText(KEY_PRL_VERSION, mPhone.getCdmaPrlVersion());
-
- // device is not GSM/UMTS, do not display GSM/UMTS features
- // check Null in case no specified preference in overlay xml
- removePreferenceFromScreen(KEY_IMEI);
removePreferenceFromScreen(KEY_IMEI_SV);
+
+ if (mPhone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE) {
+ // Show ICC ID and IMEI for LTE device
+ setSummaryText(KEY_ICC_ID, mPhone.getIccSerialNumber());
+ setSummaryText(KEY_IMEI, mPhone.getImei());
+ } else {
+ // device is not GSM/UMTS, do not display GSM/UMTS features
+ // check Null in case no specified preference in overlay xml
+ removePreferenceFromScreen(KEY_IMEI);
+ removePreferenceFromScreen(KEY_ICC_ID);
+ }
} else {
setSummaryText(KEY_IMEI, mPhone.getDeviceId());
@@ -248,6 +257,7 @@ public class Status extends PreferenceActivity {
removePreferenceFromScreen(KEY_PRL_VERSION);
removePreferenceFromScreen(KEY_MEID_NUMBER);
removePreferenceFromScreen(KEY_MIN_NUMBER);
+ removePreferenceFromScreen(KEY_ICC_ID);
}
String rawNumber = mPhone.getLine1Number(); // may be null or empty
@@ -291,7 +301,7 @@ public class Status extends PreferenceActivity {
registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
mHandler.sendEmptyMessage(EVENT_UPDATE_STATS);
}
-
+
@Override
public void onPause() {
super.onPause();
@@ -325,7 +335,7 @@ public class Status extends PreferenceActivity {
findPreference(preference).setSummary(
SystemProperties.get(property, alt));
} catch (RuntimeException e) {
-
+
}
}
@@ -338,12 +348,12 @@ public class Status extends PreferenceActivity {
findPreference(preference).setSummary(text);
}
}
-
+
private void updateNetworkType() {
// Whether EDGE, UMTS, etc...
setSummary(KEY_NETWORK_TYPE, TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE, sUnknown);
}
-
+
private void updateDataState() {
int state = mTelephonyManager.getDataState();
String display = mRes.getString(R.string.radioInfo_unknown);
@@ -362,14 +372,14 @@ public class Status extends PreferenceActivity {
display = mRes.getString(R.string.radioInfo_data_disconnected);
break;
}
-
+
setSummaryText(KEY_DATA_STATE, display);
}
private void updateServiceState(ServiceState serviceState) {
int state = serviceState.getState();
String display = mRes.getString(R.string.radioInfo_unknown);
-
+
switch (state) {
case ServiceState.STATE_IN_SERVICE:
display = mRes.getString(R.string.radioInfo_service_in);
@@ -382,9 +392,9 @@ public class Status extends PreferenceActivity {
display = mRes.getString(R.string.radioInfo_service_off);
break;
}
-
+
setSummaryText(KEY_SERVICE_STATE, display);
-
+
if (serviceState.getRoaming()) {
setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));
} else {
@@ -392,7 +402,7 @@ public class Status extends PreferenceActivity {
}
setSummaryText(KEY_OPERATOR_NAME, serviceState.getOperatorAlphaLong());
}
-
+
void updateSignalStrength() {
// TODO PhoneStateIntentReceiver is deprecated and PhoneStateListener
// should probably used instead.
@@ -429,7 +439,7 @@ public class Status extends PreferenceActivity {
Preference wifiMacAddressPref = findPreference(KEY_WIFI_MAC_ADDRESS);
String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
- wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
+ wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
: getString(R.string.status_unavailable));
Preference wifiIpAddressPref = findPreference(KEY_WIFI_IP_ADDRESS);
@@ -465,7 +475,7 @@ public class Status extends PreferenceActivity {
mUptime.setSummary(convert(ut));
}
-
+
private String pad(int n) {
if (n >= 10) {
return String.valueOf(n);