diff options
| -rw-r--r-- | telephony/java/android/telephony/AvailableNetworkInfo.java | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/AvailableNetworkInfo.java b/telephony/java/android/telephony/AvailableNetworkInfo.java index fe07370394ad..4da79b34a55e 100644 --- a/telephony/java/android/telephony/AvailableNetworkInfo.java +++ b/telephony/java/android/telephony/AvailableNetworkInfo.java @@ -110,6 +110,7 @@ public final class AvailableNetworkInfo implements Parcelable { private AvailableNetworkInfo(Parcel in) { mSubId = in.readInt(); mPriority = in.readInt(); + mMccMncs = new ArrayList<>(); in.readStringList(mMccMncs); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 430d24fd812b..71b18fd4ca84 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -9796,7 +9796,7 @@ public class TelephonyManager { boolean ret = false; try { IOns iOpportunisticNetworkService = getIOns(); - if (iOpportunisticNetworkService != null) { + if (iOpportunisticNetworkService != null && availableNetworks != null) { ret = iOpportunisticNetworkService.updateAvailableNetworks(availableNetworks, pkgForDebug); } |