diff options
| author | Diogo Ferreira <diogo@underdev.org> | 2016-09-15 14:55:04 +0100 |
|---|---|---|
| committer | Marcos Marado <mmarado@cyngn.com> | 2016-10-25 08:46:00 -0700 |
| commit | 8d5925b2d977570fdf6e065ebe51ca90c66d97a5 (patch) | |
| tree | 44a119e1bdd51ff58474601e050b1aae79d34631 /src | |
| parent | 345b425f13e4d0912d39b1e1e5dcb2fd44f32fa1 (diff) | |
| download | packages_apps_Settings-8d5925b2d977570fdf6e065ebe51ca90c66d97a5.zip packages_apps_Settings-8d5925b2d977570fdf6e065ebe51ca90c66d97a5.tar.gz packages_apps_Settings-8d5925b2d977570fdf6e065ebe51ca90c66d97a5.tar.bz2 | |
Settings: Apn: Don't dereference a null mSubscriptionInfo
When switching sims mSubscriptionInfo can be temporarily null, don't
dereference it in those cases. The interface will be updated afterwards
when the subscription status changes.
Change-Id: I1011a10434fad8fd911164217b9fb2d0dfb82b2a
Ticket: CYNGNOS-3291
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ApnSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index 4bb836a..b36ab1c 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -430,7 +430,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements String key = null; Uri uri; - if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null) { + if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null + && mSubscriptionInfo != null) { uri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI, String.valueOf(mSubscriptionInfo.getSubscriptionId())); uri = Uri.withAppendedPath(uri, mImsi); |