提交: 8d5925b2d977570fdf6e065ebe51ca90c66d97a5 - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修訂: 8d5925b2d977570fdf6e065ebe51ca90c66d97a5 (tree)
• 時間: 2016-10-26 00:46:00
• 作者: Diogo Ferreira <diogo@unde...>
• Commiter: Marcos Marado

Log Message

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

Change Summary

• modified: src/com/android/settings/ApnSettings.java

差異

--- 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);