Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcfbbfc5 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by android-build-merger
Browse files

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

am: 3dc6ce7e

Change-Id: I171da8ec35958bc0b57a0d649fbb7b3d83624910
parents bcfa1bfe 3dc6ce7e

telephony/java/android/telephony/AvailableNetworkInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

    }

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }