summaryrefslogtreecommitdiffstats
path: root/service/java/com/android
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2019-05-16 20:45:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-16 20:45:55 +0000
commit7d44d68570537a387c6e0efdcb1ebe28a8367fbb (patch)
tree40d6c8ad7bf0d419a833226029a21d43dac33e37 /service/java/com/android
parentba6afe1adbb6afed25bd78e88b541326d969dba2 (diff)
parentea508d5b0512a2056ed02b82c56b987917665f43 (diff)
downloadandroid_frameworks_opt_net_wifi-7d44d68570537a387c6e0efdcb1ebe28a8367fbb.tar.gz
android_frameworks_opt_net_wifi-7d44d68570537a387c6e0efdcb1ebe28a8367fbb.tar.bz2
android_frameworks_opt_net_wifi-7d44d68570537a387c6e0efdcb1ebe28a8367fbb.zip
Merge "ClentModeImpl: Reset networkspecifier on agent" into qt-dev
Diffstat (limited to 'service/java/com/android')
-rw-r--r--service/java/com/android/server/wifi/ClientModeImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index f9b7eba59..4adf27ff0 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -4626,6 +4626,9 @@ public class ClientModeImpl extends StateMachine {
private NetworkCapabilities getCapabilities(WifiConfiguration currentWifiConfiguration) {
final NetworkCapabilities result = new NetworkCapabilities(mNetworkCapabilitiesFilter);
+ // MatchAllNetworkSpecifier set in the mNetworkCapabilitiesFilter should never be set in the
+ // agent's specifier.
+ result.setNetworkSpecifier(null);
if (currentWifiConfiguration == null) {
return result;
}