diff options
author | Roshan Pius <rpius@google.com> | 2018-11-17 03:52:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-17 03:52:04 +0000 |
commit | eb9f8195dbf43f754875b5d1806b83f1765c3041 (patch) | |
tree | 66ddaf75e7ea63e639e354564a6b953271c6d8d7 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 9e12f816fd1d0b03cc3562c681d774e6a9798ee8 (diff) | |
parent | 7d18334f1d4ac4f74c0323ed1f045f9d87c014f7 (diff) |
Merge changes from topics "abort_network_request", "untrused_network", "on_match_scan_results", "network_suggestions_impl"
* changes:
WifiManager: Add abort callback for network request
WifiNetworkAgentSpecifier: Allow satisfiedBy call for 2 instances
WifiConfiguration: Add a field to mark network as trusted
WifiManager: Send list of matching scan results for network request
WifiManager: Implement network suggestion API
wifi(API): Send directed broadcast post connection for suggestions
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions