From 760a240d0ea57fc7c2d1b9503032cd940fd424b0 Mon Sep 17 00:00:00 2001
From: Sooraj Sasindran <sasindran@google.com>
Date: Tue, 15 Jan 2019 14:53:52 -0800
Subject: Allocate memory before reading from parcel

Allocate memory for mccmnc before reading from parcel
Bug: 113613093
Test: verified manual system test that request sent down correctly.

Change-Id: Ib436dc8dc62e7237143e099b1af23b26468b0392
---
 telephony/java/android/telephony/AvailableNetworkInfo.java | 1 +
 telephony/java/android/telephony/TelephonyManager.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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);
             }
-- 
cgit v1.2.3-59-g8ed1b