Merge changes Ia9932379,Ic5e2fa1c into qt-dev

* changes:
  WifiNetworkFactory: Reject requests for internet with specifier
  WifiConfigStore: Add wtf for any data integrity failure

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
index 118b96245..d4e6594c8 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
@@ -279,6 +279,24 @@ public class WifiNetworkFactoryTest {
     }
 
     /**
+     * Validates handling of acceptNetwork with a network specifier with internet capability.
+     */
+    @Test
+    public void testHandleAcceptNetworkRequestFromWithInternetCapability() throws Exception {
+        when(mActivityManager.getPackageImportance(TEST_PACKAGE_NAME_1))
+                .thenReturn(IMPORTANCE_FOREGROUND);
+
+        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
+        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        mNetworkRequest.networkCapabilities.addCapability(
+                NetworkCapabilities.NET_CAPABILITY_INTERNET);
+
+        assertFalse(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
+        mLooper.dispatchAll();
+        verifyUnfullfillableDispatched(mConnectivityMessenger);
+    }
+
+    /**
      * Validates handling of acceptNetwork with a network specifier from a non foreground
      * app/service.
      */
@@ -499,6 +517,21 @@ public class WifiNetworkFactoryTest {
     }
 
     /**
+     * Validates handling of new network request with network specifier with internet capability.
+     */
+    @Test
+    public void testHandleNetworkRequestWithSpecifierAndInternetCapability() throws Exception {
+        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
+        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        mNetworkRequest.networkCapabilities.addCapability(
+                NetworkCapabilities.NET_CAPABILITY_INTERNET);
+
+        mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
+        mLooper.dispatchAll();
+        verifyUnfullfillableDispatched(mConnectivityMessenger);
+    }
+
+    /**
      * Verify handling of new network request with network specifier for a hidden network.
      */
     @Test