| commit | 5a1b74b6d58ddf05e4450da6c2bd2e5d340d0a0d | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Feb 13 20:58:59 2019 +0900 |
| committer | Remi NGUYEN VAN <reminv@google.com> | Thu Feb 14 20:36:40 2019 +0900 |
| tree | bc0bb7c7dc6a22e7efb882456c4121ef5a822130 | |
| parent | 99370a2f3eb0249d2521b9556e832efc3b19d8a7 [diff] |
Remove NetworkMonitor dependency on ICaptivePortal ICaptivePortal is used in the framework and cannot be used as a dependency in NetworkMonitor, as the framework class takes precedence when linking. Also fix NetworkMonitorTest that was not verifying the right startCaptivePortalApp call. (cherry-pick of aosp/904953 with minor conflict in Android.bp) Test: atest FrameworksNetTests NetworkStackTests Bug: 124033493 Change-Id: Ib6a89e54312628662b130fbeec18d11e139f09fa