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

Bug Fix: SIM Status will display the proper network type

Browse Source 
Bug: 18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
This commit is contained in:
PauloftheWest
2014-11-25 12:15:35 -08:00
parent 1dce16a61c
commit 6fc9207ebe
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -22,6 +22,8 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.os.ServiceManager;
import android.os.RemoteException;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.preference.Preference; import android.preference.Preference;
@@ -34,9 +36,11 @@ import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.provider.Telephony;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.DefaultPhoneNotifier; import com.android.internal.telephony.DefaultPhoneNotifier;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.PhoneFactory;
@@ -232,11 +236,18 @@ public class SimStatus extends PreferenceActivity {
private void updateNetworkType() { private void updateNetworkType() {
// Whether EDGE, UMTS, etc... // Whether EDGE, UMTS, etc...
String networktype = null; String networktype = null;
if (TelephonyManager.NETWORK_TYPE_UNKNOWN final ITelephony telephony = ITelephony.Stub.asInterface(
!= mTelephonyManager.getNetworkType(mSir.getSubscriptionId())) { ServiceManager.getService(Context.TELEPHONY_SERVICE));
networktype = mTelephonyManager.getNetworkTypeName( try {
mTelephonyManager.getNetworkType(mSir.getSubscriptionId())); 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.
}
setSummaryText(KEY_NETWORK_TYPE, networktype); setSummaryText(KEY_NETWORK_TYPE, networktype);
} }