commit 0687e98f22dededa3c30d6acd96a79be81212f1a
author Roshan Pius <rpius@google.com> Fri Mar 12 09:28:11 2021 -0800
committer Roshan Pius <rpius@google.com> Fri Mar 12 12:27:18 2021 -0800
tree 587050473b8684649b1b64f0b7a286a57b7cb82c
parent d9675c7820b0c8ce933a99cc6e36ac24ec283917

wifi: Merge oem paid & oem private network factories

Keeping 2 separate factories for catching these requests is not really
useful. Also, If a request has both oem paid & oem private net
capabilities set, then the request is not being sent to either factories
(since neither can serve that request).

Merge the 2 factories & handle requests appropriately.

Also, fixed some logs in NetworkSuggestionNominator.

Bug: 182512201
Test: atest com.android.server.wifi
Test: atest android.net.wifi.cts (added a test which sets both net caps)
Change-Id: I63573b24fd47420abf627365ac9012cc1f445d2f