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

Commit 8c1f0b3f authored by vandwalle's avatar vandwalle Committed by Android Git Automerger
Browse files

am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this... 

am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev

* commit 'f7c9ffc381b4f8001caacfdd82386f0b060e4dd1':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
parents a99a47b0 567943bd

wifi/java/android/net/wifi/ScanResult.java

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ public class ScanResult implements Parcelable { 
                sr.autoJoinStatus = in.readInt();

                sr.untrusted = in.readInt() != 0;

                sr.numConnection = in.readInt();

                sr.numUsage = in.readInt();

                int n = in.readInt();

                if (n != 0) {

                    sr.informationElements = new InformationElement[n];