Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allocate memory before reading from parcel"

Browse Source 
am: be8881da3b

Change-Id: I794c9cb48900a9568802aac760767b29df0fdbd1
This commit is contained in:
Sooraj Sasindran
2019-01-15 20:22:50 -08:00
committed by android-build-merger
parent c564b6e118 be8881da3b
commit 3dc6ce7e8b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/android/telephony/AvailableNetworkInfo.java
View File

@@ -110,6 +110,7 @@ public final class AvailableNetworkInfo implements Parcelable {
private AvailableNetworkInfo(Parcel in) { private AvailableNetworkInfo(Parcel in) {
mSubId = in.readInt(); mSubId = in.readInt();
mPriority = in.readInt(); mPriority = in.readInt();
mMccMncs = new ArrayList<>();
in.readStringList(mMccMncs); in.readStringList(mMccMncs);
} }

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -9796,7 +9796,7 @@ public class TelephonyManager {
boolean ret = false; boolean ret = false;
try { try {
IOns iOpportunisticNetworkService = getIOns(); IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) { if (iOpportunisticNetworkService != null && availableNetworks != null) {
ret = iOpportunisticNetworkService.updateAvailableNetworks(availableNetworks, ret = iOpportunisticNetworkService.updateAvailableNetworks(availableNetworks,
pkgForDebug); pkgForDebug);
} }