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 | f12817f87720c383b12c86b6f2dfbb4821f2e4a8 (patch) | |
| tree | 06abe9a10666f29265dd38b1c9d8dfc782185285 /service/java/com/android/server/wifi/WifiConfigManager.java | |
| parent | 4905151a301fab92f1e39683d06b5c9d26d1327c (diff) | |
| parent | 45b49b22d2c9a447c45d0fc4949026b248bd3c21 (diff) | |
| download | android_frameworks_opt_net_wifi-f12817f87720c383b12c86b6f2dfbb4821f2e4a8.tar.gz android_frameworks_opt_net_wifi-f12817f87720c383b12c86b6f2dfbb4821f2e4a8.tar.bz2 android_frameworks_opt_net_wifi-f12817f87720c383b12c86b6f2dfbb4821f2e4a8.zip | |
Merge changes from topics "abort_network_request", "untrused_network", "network_suggestions_impl", "on_match_scan_results"
* changes:
WifiNetworkFactory: Send abort to UI
WifiNetworkSelector: Mark WFA networks as untrusted
WifiNetworkFactory: Handle new request while processing
ClientModeImpl: Attach WifiNetworkAgentSpecifier
ClientModeImpl: Send connection status to network factory
WifiNetworkFactory: Handle network connection/failure
WifiNetworkFactory: Handle stale user selection
WifiNetworkFactory: Handle user selection
WifiNetworkSuggestionsManager: Send post connection broadcast
WifiNetworkSuggestionsManager: Maintain scan result lookup map
WifiNetworkSuggestionsManager: Add a module to manage suggestions
WifiNetworkFactory: Send list of matching scan results for network request
WifiConnectivityManager: Refactor auto-join enable/disable
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index ff9d8bb33..48ba44a82 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -1005,6 +1005,7 @@ public class WifiConfigManager { newInternalConfig.requirePMF = externalConfig.requirePMF; newInternalConfig.noInternetAccessExpected = externalConfig.noInternetAccessExpected; newInternalConfig.ephemeral = externalConfig.ephemeral; + newInternalConfig.trusted = externalConfig.trusted; newInternalConfig.useExternalScores = externalConfig.useExternalScores; newInternalConfig.shared = externalConfig.shared; |