From b4bac9841a13c1ad747da3bc981993f0d6d67fd0 Mon Sep 17 00:00:00 2001 From: xiaognol Date: Tue, 14 Jun 2016 01:39:30 +0800 Subject: Settings:Fix mImsi null cause ApnSettings crash mImsi may be "null" in some case,if we use "" instead may cause crash in ApnSettings&com.android.phone. so fix it to use old way to set Apn in that "null" case. Change-Id: I0119e9a3f58c688e0e271ae62f50484ad8a29da9 --- src/com/android/settings/ApnSettings.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index 0459a13..4bb836a 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -164,9 +164,6 @@ public class ApnSettings extends SettingsPreferenceFragment implements SubscriptionManager.INVALID_SUBSCRIPTION_ID); mImsi = activity.getIntent().getStringExtra(EXTRA_IMSI); - if (mImsi == null) { - mImsi = ""; - } mUm = (UserManager) getSystemService(Context.USER_SERVICE); @@ -419,7 +416,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements ContentValues values = new ContentValues(); values.put(APN_ID, mSelectedKey); - if (TelephonyManager.getDefault().getPhoneCount() > 1) { + if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null) { Uri qUri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI, String.valueOf(mSubscriptionInfo.getSubscriptionId())); qUri = Uri.withAppendedPath(qUri, mImsi); @@ -433,7 +430,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements String key = null; Uri uri; - if (TelephonyManager.getDefault().getPhoneCount() > 1) { + if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null) { uri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI, String.valueOf(mSubscriptionInfo.getSubscriptionId())); uri = Uri.withAppendedPath(uri, mImsi); -- cgit v1.1