Merge "ClentModeImpl: Reset networkspecifier on agent" into qt-dev

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;
         }