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

Merge "Allocate memory before reading from parcel" am: be8881da3b

Browse Source 
am: 3dc6ce7e8b

Change-Id: I171da8ec35958bc0b57a0d649fbb7b3d83624910
This commit is contained in:
Sooraj Sasindran
2019-01-15 20:33:09 -08:00
committed by android-build-merger
parent bcfa1bfe3d 3dc6ce7e8b
commit dcfbbfc5e5
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) {
mSubId = in.readInt();
mPriority = in.readInt();
mMccMncs = new ArrayList<>();
in.readStringList(mMccMncs);
}

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

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