am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev

* commit '531127a5c2293e46e16fb9bc013078506c15122e':
  SIM Status now shows data connection instead of voice.
This commit is contained in:
Prem Kumar
2014-12-29 13:28:18 +00:00
committed by Android Git Automerger

View File

@@ -236,16 +236,11 @@ public class SimStatus extends PreferenceActivity {
private void updateNetworkType() {
// Whether EDGE, UMTS, etc...
String networktype = null;
final ITelephony telephony = ITelephony.Stub.asInterface(
ServiceManager.getService(Context.TELEPHONY_SERVICE));
try {
final int actualNetworkType = telephony.getVoiceNetworkTypeForSubscriber(
mSir.getSubscriptionId());
if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualNetworkType) {
networktype = mTelephonyManager.getNetworkTypeName(actualNetworkType);
}
} catch (RemoteException remoteException){
// Do nothing, networkType will remain null.
final int subId = mSir.getSubscriptionId();
final int actualNetworkType = mTelephonyManager.getDataNetworkType(
mSir.getSubscriptionId());
if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualNetworkType) {
networktype = mTelephonyManager.getNetworkTypeName(actualNetworkType);
}
setSummaryText(KEY_NETWORK_TYPE, networktype);