diff options
| author | Ningyuan Wang <nywang@google.com> | 2016-10-11 11:42:12 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-12-09 11:00:02 -0800 |
| commit | c579cce67bbb8d0a64b58b3b89d53ae1bce330e9 (patch) | |
| tree | 0324ef91d4279f9f4e75bf1ec1c4b9d2406de8f0 /service/lib | |
| parent | d8748b8faf9c002b59e059d52d49fcc5b7ca5887 (diff) | |
| download | android_frameworks_opt_net_wifi-c579cce67bbb8d0a64b58b3b89d53ae1bce330e9.tar.gz android_frameworks_opt_net_wifi-c579cce67bbb8d0a64b58b3b89d53ae1bce330e9.tar.bz2 android_frameworks_opt_net_wifi-c579cce67bbb8d0a64b58b3b89d53ae1bce330e9.zip | |
resolve merge conflicts of 849c5c7 to mnc-devstable/cm-13.0-ZNH0E
This resovles the merge conflict for ag/1514448/
After Android M, this function uses num_bssid instead of num_ap.
Both are prone to stack overflow attacks.
CYNGNOS-3312
Bug: 31856351
Test: compile, unit tests, manual test
Change-Id: I194850a4c79ddf478d98e750f65b24e82d99ebc0
Diffstat (limited to 'service/lib')
0 files changed, 0 insertions, 0 deletions