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

Commit 3e5ac123 authored by Etan Cohen's avatar Etan Cohen
Browse files

[NAN] TLV utilities iterator - throw correct exception 

Make sure that iterator.next() validates that next element exists -
otherwise throw the exception specified by the interface.

Bug: 30096512
Change-Id: I327da433e3f1181e272c81ee503cbe8aab323f7e
parent 0a5b7efc

wifi/java/android/net/wifi/nan/TlvBufferUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import java.nio.BufferOverflowException; 
import java.nio.ByteOrder;

import java.util.Arrays;

import java.util.Iterator;

import java.util.NoSuchElementException;



/**

 * Utility class to construct and parse byte arrays using the TLV format -
@@ -464,6 +465,10 @@ public class TlvBufferUtils { 


                @Override

                public TlvElement next() {

                    if (!hasNext()) {

                        throw new NoSuchElementException();

                    }



                    int type = 0;

                    if (mTypeSize == 1) {

                        type = mArray[mOffset];