OSDN Git Service

Settings: Apn: Don't dereference a null mSubscriptionInfo
authorDiogo Ferreira <diogo@underdev.org>
Thu, 15 Sep 2016 13:55:04 +0000 (14:55 +0100)
committerMarcos Marado <mmarado@cyngn.com>
Tue, 25 Oct 2016 15:46:00 +0000 (08:46 -0700)
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

src/com/android/settings/ApnSettings.java

index 4bb836a..b36ab1c 100644 (file)
@@ -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);