commit | ad9f6d89f6b6e52f4022ca9a979e5a239ab4f1b1 | [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 | 529dda089d7984f0bc63713f177763f051eb380d | |
parent | a18c91cc73a0d1fea0581515ad728cb551ebbc41 [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