Merge "WifiNetworkFactory: Use uid/packageName embedded in NetworkRequest"

8 files changed, 185 insertions, 246 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index cdd16f7ad..c6418c9cd 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -4131,12 +4131,10 @@ public class ClientModeImpl extends StateMachine {
     }
 
     private WifiNetworkAgentSpecifier createNetworkAgentSpecifier(
-            @NonNull WifiConfiguration currentWifiConfiguration, @Nullable String currentBssid,
-            int specificRequestUid, @NonNull String specificRequestPackageName) {
+            @NonNull WifiConfiguration currentWifiConfiguration, @Nullable String currentBssid) {
         currentWifiConfiguration.BSSID = currentBssid;
         WifiNetworkAgentSpecifier wns =
-                new WifiNetworkAgentSpecifier(currentWifiConfiguration, specificRequestUid,
-                        specificRequestPackageName);
+                new WifiNetworkAgentSpecifier(currentWifiConfiguration);
         return wns;
     }
 
@@ -4183,13 +4181,13 @@ public class ClientModeImpl extends StateMachine {
         if (specificRequestUidAndPackageName.first != Process.INVALID_UID) {
             // Remove internet capability.
             result.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+            // Fill up the uid/packageName for this connection.
+            result.setRequestorUid(specificRequestUidAndPackageName.first);
+            result.setRequestorPackageName(specificRequestUidAndPackageName.second);
+            // Fill up the network agent specifier for this connection.
+            result.setNetworkSpecifier(createNetworkAgentSpecifier(
+                    currentWifiConfiguration, getCurrentBSSID()));
         }
-        // Fill up the network agent specifier for this connection.
-        result.setNetworkSpecifier(
-                createNetworkAgentSpecifier(
-                        currentWifiConfiguration, getCurrentBSSID(),
-                        specificRequestUidAndPackageName.first,
-                        specificRequestUidAndPackageName.second));
         return result;
     }
 
diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java
index 70ca7be4c..fcea03754 100644
--- a/service/java/com/android/server/wifi/WifiNetworkFactory.java
+++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java
@@ -164,7 +164,7 @@ public class WifiNetworkFactory extends NetworkFactory {
         public final @SecurityType int networkType;
 
         AccessPoint(@NonNull String ssid, @NonNull MacAddress bssid,
-                    @SecurityType int networkType) {
+                @SecurityType int networkType) {
             this.ssid = ssid;
             this.bssid = bssid;
             this.networkType = networkType;
@@ -345,14 +345,14 @@ public class WifiNetworkFactory extends NetworkFactory {
     }
 
     public WifiNetworkFactory(Looper looper, Context context, NetworkCapabilities nc,
-                              ActivityManager activityManager, AlarmManager alarmManager,
-                              AppOpsManager appOpsManager,
-                              Clock clock, WifiInjector wifiInjector,
-                              WifiConnectivityManager connectivityManager,
-                              WifiConfigManager configManager,
-                              WifiConfigStore configStore,
-                              WifiPermissionsUtil wifiPermissionsUtil,
-                              WifiMetrics wifiMetrics) {
+            ActivityManager activityManager, AlarmManager alarmManager,
+            AppOpsManager appOpsManager,
+            Clock clock, WifiInjector wifiInjector,
+            WifiConnectivityManager connectivityManager,
+            WifiConfigManager configManager,
+            WifiConfigStore configStore,
+            WifiPermissionsUtil wifiPermissionsUtil,
+            WifiMetrics wifiMetrics) {
         super(looper, context, TAG, nc);
         mContext = context;
         mActivityManager = activityManager;
@@ -403,7 +403,7 @@ public class WifiNetworkFactory extends NetworkFactory {
      * Add a new callback for network request match handling.
      */
     public void addCallback(IBinder binder, INetworkRequestMatchCallback callback,
-                            int callbackIdentifier) {
+            int callbackIdentifier) {
         if (mActiveSpecificNetworkRequest == null) {
             Log.wtf(TAG, "No valid network request. Ignoring callback registration");
             try {
@@ -446,19 +446,19 @@ public class WifiNetworkFactory extends NetworkFactory {
     }
 
     private boolean canNewRequestOverrideExistingRequest(
-            WifiNetworkSpecifier newRequest, WifiNetworkSpecifier existingRequest) {
+            NetworkRequest newRequest, NetworkRequest existingRequest) {
         if (existingRequest == null) return true;
         // Request from app with NETWORK_SETTINGS can override any existing requests.
-        if (mWifiPermissionsUtil.checkNetworkSettingsPermission(newRequest.requestorUid)) {
+        if (mWifiPermissionsUtil.checkNetworkSettingsPermission(newRequest.getRequestorUid())) {
             return true;
         }
         // Request from fg app can override any existing requests.
-        if (isRequestFromForegroundApp(newRequest.requestorPackageName)) return true;
+        if (isRequestFromForegroundApp(newRequest.getRequestorPackageName())) return true;
         // Request from fg service can override only if the existing request is not from a fg app.
-        if (!isRequestFromForegroundApp(existingRequest.requestorPackageName)) return true;
+        if (!isRequestFromForegroundApp(existingRequest.getRequestorPackageName())) return true;
         Log.e(TAG, "Already processing request from a foreground app "
-                + existingRequest.requestorPackageName + ". Rejecting request from "
-                + newRequest.requestorPackageName);
+                + existingRequest.getRequestorPackageName() + ". Rejecting request from "
+                + newRequest.getRequestorPackageName());
         return false;
     }
 
@@ -473,21 +473,27 @@ public class WifiNetworkFactory extends NetworkFactory {
         // (NetworkAgent for connection with WifiNetworkSpecifier will not have internet capability)
         if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
             Log.e(TAG, "Request with wifi network specifier cannot contain "
-                    + "NET_CAPABILITY_INTERNET. Rejecting ");
+                    + "NET_CAPABILITY_INTERNET. Rejecting");
             return false;
         }
-        WifiNetworkSpecifier wns = (WifiNetworkSpecifier) ns;
-        if (wns.requestorPackageName == null) {
-            Log.e(TAG, "Null  package name. Rejecting ");
+        if (networkRequest.getRequestorUid() == Process.INVALID_UID) {
+            Log.e(TAG, "Request with wifi network specifier should contain valid uid. Rejecting");
+            return false;
+        }
+        if (TextUtils.isEmpty(networkRequest.getRequestorPackageName())) {
+            Log.e(TAG, "Request with wifi network specifier should contain valid package name."
+                    + "Rejecting");
             return false;
         }
         try {
-            mAppOpsManager.checkPackage(wns.requestorUid, wns.requestorPackageName);
+            mAppOpsManager.checkPackage(
+                    networkRequest.getRequestorUid(), networkRequest.getRequestorPackageName());
         } catch (SecurityException e) {
-            Log.e(TAG, "Invalid uid/package name " + wns.requestorPackageName + ", "
-                    + wns.requestorPackageName + ". Rejecting ", e);
+            Log.e(TAG, "Invalid uid/package name " + networkRequest.getRequestorUid() + ", "
+                    + networkRequest.getRequestorPackageName() + ". Rejecting", e);
             return false;
         }
+        WifiNetworkSpecifier wns = (WifiNetworkSpecifier) ns;
         if (!WifiConfigurationUtil.validateNetworkSpecifier(wns)) {
             Log.e(TAG, "Invalid network specifier. Rejecting ");
             return false;
@@ -518,34 +524,36 @@ public class WifiNetworkFactory extends NetworkFactory {
             }
             WifiNetworkSpecifier wns = (WifiNetworkSpecifier) ns;
             // Only allow specific wifi network request from foreground app/service.
-            if (!mWifiPermissionsUtil.checkNetworkSettingsPermission(wns.requestorUid)
-                    && !isRequestFromForegroundAppOrService(wns.requestorPackageName)) {
+            if (!mWifiPermissionsUtil.checkNetworkSettingsPermission(
+                    networkRequest.getRequestorUid())
+                    && !isRequestFromForegroundAppOrService(
+                    networkRequest.getRequestorPackageName())) {
                 Log.e(TAG, "Request not from foreground app or service."
-                        + " Rejecting request from " + wns.requestorPackageName);
+                        + " Rejecting request from " + networkRequest.getRequestorPackageName());
                 releaseRequestAsUnfulfillableByAnyFactory(networkRequest);
                 return false;
             }
             // If there is an active request, only proceed if the new request is from a foreground
             // app.
             if (!canNewRequestOverrideExistingRequest(
-                    wns, mActiveSpecificNetworkRequestSpecifier)) {
+                    networkRequest, mActiveSpecificNetworkRequest)) {
                 Log.e(TAG, "Request cannot override active request."
-                        + " Rejecting request from " + wns.requestorPackageName);
+                        + " Rejecting request from " + networkRequest.getRequestorPackageName());
                 releaseRequestAsUnfulfillableByAnyFactory(networkRequest);
                 return false;
             }
             // If there is a connected request, only proceed if the new request is from a foreground
             // app.
             if (!canNewRequestOverrideExistingRequest(
-                    wns, mConnectedSpecificNetworkRequestSpecifier)) {
+                    networkRequest, mConnectedSpecificNetworkRequest)) {
                 Log.e(TAG, "Request cannot override connected request."
-                        + " Rejecting request from " + wns.requestorPackageName);
+                        + " Rejecting request from " + networkRequest.getRequestorPackageName());
                 releaseRequestAsUnfulfillableByAnyFactory(networkRequest);
                 return false;
             }
             if (mVerboseLoggingEnabled) {
                 Log.v(TAG, "Accepted network request with specifier from fg "
-                        + (isRequestFromForegroundApp(wns.requestorPackageName)
+                        + (isRequestFromForegroundApp(networkRequest.getRequestorPackageName())
                         ? "app" : "service"));
             }
         }
@@ -588,8 +596,7 @@ public class WifiNetworkFactory extends NetworkFactory {
             mActiveSpecificNetworkRequest = networkRequest;
             WifiNetworkSpecifier wns = (WifiNetworkSpecifier) ns;
             mActiveSpecificNetworkRequestSpecifier = new WifiNetworkSpecifier(
-                    wns.ssidPatternMatcher, wns.bssidPatternMatcher, wns.wifiConfiguration,
-                    wns.requestorUid, wns.requestorPackageName);
+                    wns.ssidPatternMatcher, wns.bssidPatternMatcher, wns.wifiConfiguration);
             mWifiMetrics.incrementNetworkRequestApiNumRequest();
 
             // Fetch the latest cached scan results to speed up network matching.
@@ -683,12 +690,12 @@ public class WifiNetworkFactory extends NetworkFactory {
             return Pair.create(Process.INVALID_UID, "");
         }
         if (mConnectedSpecificNetworkRequestSpecifier != null) {
-            return Pair.create(mConnectedSpecificNetworkRequestSpecifier.requestorUid,
-                    mConnectedSpecificNetworkRequestSpecifier.requestorPackageName);
+            return Pair.create(mConnectedSpecificNetworkRequest.getRequestorUid(),
+                    mConnectedSpecificNetworkRequest.getRequestorPackageName());
         }
         if (mActiveSpecificNetworkRequestSpecifier != null) {
-            return Pair.create(mActiveSpecificNetworkRequestSpecifier.requestorUid,
-                    mActiveSpecificNetworkRequestSpecifier.requestorPackageName);
+            return Pair.create(mActiveSpecificNetworkRequest.getRequestorUid(),
+                    mActiveSpecificNetworkRequest.getRequestorPackageName());
         }
         return Pair.create(Process.INVALID_UID, "");
     }
@@ -710,8 +717,8 @@ public class WifiNetworkFactory extends NetworkFactory {
         }
         NetworkUpdateResult networkUpdateResult =
                 mWifiConfigManager.addOrUpdateNetwork(
-                        network, mActiveSpecificNetworkRequestSpecifier.requestorUid,
-                        mActiveSpecificNetworkRequestSpecifier.requestorPackageName);
+                        network, mActiveSpecificNetworkRequest.getRequestorUid(),
+                        mActiveSpecificNetworkRequest.getRequestorPackageName());
         if (mVerboseLoggingEnabled) {
             Log.v(TAG, "Added network to config manager " + networkUpdateResult.netId);
         }
@@ -765,7 +772,7 @@ public class WifiNetworkFactory extends NetworkFactory {
         ConnectActionListener connectActionListener = new ConnectActionListener();
         mWifiInjector.getClientModeImpl().connect(null, networkId, new Binder(),
                 connectActionListener, connectActionListener.hashCode(),
-                mActiveSpecificNetworkRequestSpecifier.requestorUid);
+                mActiveSpecificNetworkRequest.getRequestorUid());
 
         // Post an alarm to handle connection timeout.
         scheduleConnectionTimeout();
@@ -1086,7 +1093,7 @@ public class WifiNetworkFactory extends NetworkFactory {
             Log.v(TAG, "Starting the next scan for " + mActiveSpecificNetworkRequestSpecifier);
         }
         // Create a worksource using the caller's UID.
-        WorkSource workSource = new WorkSource(mActiveSpecificNetworkRequestSpecifier.requestorUid);
+        WorkSource workSource = new WorkSource(mActiveSpecificNetworkRequest.getRequestorUid());
         mWifiScanner.startScan(
                 mScanSettings, new HandlerExecutor(mHandler), mScanListener, workSource);
     }
@@ -1166,7 +1173,7 @@ public class WifiNetworkFactory extends NetworkFactory {
         ApplicationInfo applicationInfo = null;
         try {
             applicationInfo = mContext.getPackageManager().getApplicationInfoAsUser(
-                packageName, 0, UserHandle.getUserHandleForUid(uid));
+                    packageName, 0, UserHandle.getUserHandleForUid(uid));
         } catch (PackageManager.NameNotFoundException e) {
             Log.e(TAG, "Failed to find app name for " + packageName);
             return "";
@@ -1181,12 +1188,12 @@ public class WifiNetworkFactory extends NetworkFactory {
         intent.addCategory(UI_START_INTENT_CATEGORY);
         intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(UI_START_INTENT_EXTRA_APP_NAME,
-                getAppName(mActiveSpecificNetworkRequestSpecifier.requestorPackageName,
-                           mActiveSpecificNetworkRequestSpecifier.requestorUid));
+                getAppName(mActiveSpecificNetworkRequest.getRequestorPackageName(),
+                        mActiveSpecificNetworkRequest.getRequestorUid()));
         intent.putExtra(UI_START_INTENT_EXTRA_REQUEST_IS_FOR_SINGLE_NETWORK,
                 isActiveRequestForSingleNetwork());
         mContext.startActivityAsUser(intent, UserHandle.getUserHandleForUid(
-                mActiveSpecificNetworkRequestSpecifier.requestorUid));
+                mActiveSpecificNetworkRequest.getRequestorUid()));
     }
 
     // Helper method to determine if the specifier does not contain any patterns and matches
@@ -1295,9 +1302,9 @@ public class WifiNetworkFactory extends NetworkFactory {
         // There should only 1 matched scan result since the request contains a specific
         // SSID + BSSID mentioned.
         ScanResult scanResult = mActiveMatchedScanResults.get(0);
-        String requestorPackageName = mActiveSpecificNetworkRequestSpecifier.requestorPackageName;
+        String requestorPackageName = mActiveSpecificNetworkRequest.getRequestorPackageName();
         UserHandle requestorUserHandle =
-                UserHandle.getUserHandleForUid(mActiveSpecificNetworkRequestSpecifier.requestorUid);
+                UserHandle.getUserHandleForUid(mActiveSpecificNetworkRequest.getRequestorUid());
         // Check if access point is approved via CDM first.
         if (isAccessPointApprovedInCompanionDeviceManager(
                 scanResult, requestorUserHandle, requestorPackageName)) {
@@ -1311,6 +1318,7 @@ public class WifiNetworkFactory extends NetworkFactory {
         return null;
     }
 
+
     // Helper method to store the all the BSSIDs matching the network from the matched scan results
     private void addNetworkToUserApprovedAccessPointMap(@NonNull WifiConfiguration network) {
         if (mActiveSpecificNetworkRequestSpecifier == null
@@ -1334,7 +1342,7 @@ public class WifiNetworkFactory extends NetworkFactory {
         }
         if (newUserApprovedAccessPoints.isEmpty()) return;
 
-        String requestorPackageName = mActiveSpecificNetworkRequestSpecifier.requestorPackageName;
+        String requestorPackageName = mActiveSpecificNetworkRequest.getRequestorPackageName();
         LinkedHashSet<AccessPoint> approvedAccessPoints =
                 mUserApprovedAccessPointMap.get(requestorPackageName);
         if (approvedAccessPoints == null) {
@@ -1446,4 +1454,3 @@ public class WifiNetworkFactory extends NetworkFactory {
         saveToStore();
     }
 }
-
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
index 2c0bcae8e..c6c58c40b 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
@@ -1355,7 +1355,7 @@ public class WifiAwareDataPathStateManager {
             }
 
             // validate UID
-            if (ns.requestorUid != uid) {
+            if (request.getRequestorUid() != uid) {
                 Log.e(TAG, "processNetworkSpecifier: networkSpecifier=" + ns.toString()
                         + " -- UID mismatch to clientId's uid=" + uid);
                 return null;
@@ -1503,6 +1503,7 @@ public class WifiAwareDataPathStateManager {
                 return false;
             }
 
+            networkCapabilities.setRequestorUid(nnri.uid);
             networkCapabilities.setNetworkSpecifier(new WifiAwareAgentNetworkSpecifier(
                     networkRequests.stream()
                             .map(NetworkRequest::getNetworkSpecifier)
diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index 2a05d96fa..c9788ddcb 100644
--- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -3446,15 +3446,7 @@ public class ClientModeImplTest extends WifiBaseTest {
 
         // should have internet capability.
         assertTrue(networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET));
-
-        NetworkSpecifier networkSpecifier = networkCapabilities.getNetworkSpecifier();
-        assertTrue(networkSpecifier instanceof WifiNetworkAgentSpecifier);
-        WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =
-                (WifiNetworkAgentSpecifier) networkSpecifier;
-        WifiNetworkAgentSpecifier expectedWifiNetworkAgentSpecifier =
-                new WifiNetworkAgentSpecifier(mCmi.getCurrentWifiConfiguration(),
-                        Process.INVALID_UID, "");
-        assertEquals(expectedWifiNetworkAgentSpecifier, wifiNetworkAgentSpecifier);
+        assertNull(networkCapabilities.getNetworkSpecifier());
     }
 
     /**
@@ -3485,9 +3477,10 @@ public class ClientModeImplTest extends WifiBaseTest {
         WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =
                 (WifiNetworkAgentSpecifier) networkSpecifier;
         WifiNetworkAgentSpecifier expectedWifiNetworkAgentSpecifier =
-                new WifiNetworkAgentSpecifier(mCmi.getCurrentWifiConfiguration(), TEST_UID,
-                        OP_PACKAGE_NAME);
+                new WifiNetworkAgentSpecifier(mCmi.getCurrentWifiConfiguration());
         assertEquals(expectedWifiNetworkAgentSpecifier, wifiNetworkAgentSpecifier);
+        assertEquals(TEST_UID, networkCapabilities.getRequestorUid());
+        assertEquals(OP_PACKAGE_NAME, networkCapabilities.getRequestorPackageName());
     }
 
     /**
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java
index eb6686d9d..702dc1745 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java
@@ -571,8 +571,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_LITERAL),
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertTrue(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -585,8 +584,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(".*", PatternMatcher.PATTERN_SIMPLE_GLOB),
                 Pair.create(MacAddress.fromString(TEST_BSSID), MacAddress.BROADCAST_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertTrue(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -599,8 +597,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_LITERAL),
                 Pair.create(MacAddress.fromString(TEST_BSSID), MacAddress.BROADCAST_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertTrue(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -613,8 +610,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(".*", PatternMatcher.PATTERN_SIMPLE_GLOB),
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertFalse(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -627,8 +623,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher("", PatternMatcher.PATTERN_LITERAL),
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertFalse(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -641,8 +636,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_LITERAL),
                 Pair.create(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertFalse(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -655,8 +649,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_LITERAL),
                 Pair.create(MacAddress.fromString(TEST_BSSID), WifiManager.ALL_ZEROS_MAC_ADDRESS),
-                WifiConfigurationTestUtil.createOpenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenNetwork());
         assertFalse(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
@@ -669,8 +662,7 @@ public class WifiConfigurationUtilTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
                 new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_PREFIX),
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS),
-                WifiConfigurationTestUtil.createOpenHiddenNetwork(),
-                TEST_UID, TEST_PACKAGE);
+                WifiConfigurationTestUtil.createOpenHiddenNetwork());
         assertFalse(WifiConfigurationUtil.validateNetworkSpecifier(specifier));
     }
 
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
index 05b99ef0e..2fa4b0ea9 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
@@ -289,8 +289,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 .thenReturn(true);
         doThrow(new SecurityException()).when(mAppOpsManager).checkPackage(anyInt(), anyString());
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         assertFalse(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
         mLooper.dispatchAll();
@@ -305,8 +304,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         when(mActivityManager.getPackageImportance(TEST_PACKAGE_NAME_1))
                 .thenReturn(IMPORTANCE_FOREGROUND);
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mNetworkRequest.networkCapabilities.addCapability(
                 NetworkCapabilities.NET_CAPABILITY_INTERNET);
 
@@ -324,8 +322,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         when(mActivityManager.getPackageImportance(TEST_PACKAGE_NAME_1))
                 .thenReturn(IMPORTANCE_FOREGROUND_SERVICE + 1);
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         assertFalse(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
         mLooper.dispatchAll();
@@ -341,8 +338,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         when(mActivityManager.getPackageImportance(TEST_PACKAGE_NAME_1))
                 .thenReturn(IMPORTANCE_FOREGROUND);
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         assertTrue(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
     }
@@ -358,8 +354,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         when(mWifiPermissionsUtil.checkNetworkSettingsPermission(TEST_UID_1))
                 .thenReturn(true);
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         assertTrue(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
     }
@@ -376,14 +371,12 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 .thenReturn(IMPORTANCE_FOREGROUND);
 
         // Handle request 1.
-        WifiNetworkSpecifier specifier1 = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier1);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Make request 2 which will be accepted because a fg app request can
         // override a fg service request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier2);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
         assertTrue(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
     }
 
@@ -399,14 +392,12 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 .thenReturn(IMPORTANCE_FOREGROUND_SERVICE);
 
         // Handle request 1.
-        WifiNetworkSpecifier specifier1 = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier1);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Make request 2 which will be accepted because a fg service request can
         // override an existing fg service request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier2);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
         assertTrue(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
     }
 
@@ -422,14 +413,12 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 .thenReturn(IMPORTANCE_FOREGROUND);
 
         // Handle request 1.
-        WifiNetworkSpecifier specifier1 = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier1);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Make request 2 which will be accepted because a fg app request can
         // override an existing fg app request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier2);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
         assertTrue(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
     }
 
@@ -446,14 +435,12 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 .thenReturn(IMPORTANCE_FOREGROUND_SERVICE);
 
         // Handle request 1.
-        WifiNetworkSpecifier specifier1 = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier1);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Make request 2 which will be rejected because a fg service request cannot
         // override a fg app request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier2);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
         assertFalse(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
         mLooper.dispatchAll();
         verify(mConnectivityManager).declareNetworkRequestUnfulfillable(eq(mNetworkRequest));
@@ -481,8 +468,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
 
         // Make request 2 which will be accepted because a fg app request can
         // override an existing fg app request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier2);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
         assertTrue(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
     }
 
@@ -508,8 +494,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
 
         // Make request 2 which will be rejected because a fg service request cannot
         // override a fg app request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier2);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
         assertFalse(mWifiNetworkFactory.acceptRequest(mNetworkRequest, 0));
         mLooper.dispatchAll();
         verify(mConnectivityManager).declareNetworkRequestUnfulfillable(eq(mNetworkRequest));
@@ -520,8 +505,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleNetworkRequestWithSpecifier() {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Verify UI start.
@@ -540,8 +524,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleNetworkRequestWithSpecifierAndInternetCapability() throws Exception {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mNetworkRequest.networkCapabilities.addCapability(
                 NetworkCapabilities.NET_CAPABILITY_INTERNET);
 
@@ -555,8 +538,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleNetworkRequestWithSpecifierForHiddenNetwork() {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, true);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, true);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Verify UI start.
@@ -565,7 +547,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         // Verify scan settings.
         verify(mWifiScanner).startScan(mScanSettingsArgumentCaptor.capture(), any(), any(),
                 mWorkSourceArgumentCaptor.capture());
-        validateScanSettings(specifier.ssidPatternMatcher.getPath());
+        validateScanSettings(
+                ((WifiNetworkSpecifier) mNetworkCapabilities.getNetworkSpecifier())
+                        .ssidPatternMatcher.getPath());
 
         verify(mWifiMetrics).incrementNetworkRequestApiNumRequest();
     }
@@ -579,20 +563,20 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
     @Test
     public void testHandleNetworkRequestWithSpecifierAfterPreviousHiddenNetworkRequest() {
         // Hidden request 1.
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, true);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, true);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         // Verify scan settings.
         verify(mWifiScanner, times(1)).startScan(mScanSettingsArgumentCaptor.capture(), any(),
                 any(), mWorkSourceArgumentCaptor.capture());
-        validateScanSettings(specifier.ssidPatternMatcher.getPath());
+        validateScanSettings(
+                ((WifiNetworkSpecifier) mNetworkCapabilities.getNetworkSpecifier())
+                        .ssidPatternMatcher.getPath());
 
         // Release request 1.
         mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
 
         // Regular request 2.
-        specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         // Verify scan settings.
         verify(mWifiScanner, times(2)).startScan(mScanSettingsArgumentCaptor.capture(), any(),
@@ -610,8 +594,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         // Make a generic request first to ensure that we re-enable auto-join after release.
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         // Make the network request with specifier.
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
@@ -633,8 +616,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testPeriodicScanNetworkRequestWithSpecifier() {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         verifyPeriodicScans(0,
@@ -650,8 +632,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testPeriodicScanCancelOnReleaseNetworkRequestWithSpecifier() {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         verifyPeriodicScans(0,
@@ -668,8 +649,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleCallbackRegistrationAndUnregistration() throws Exception {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
@@ -689,8 +669,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleCallbackRegistrationWithNoActiveRequest() throws Exception {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
 
@@ -723,11 +702,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -767,11 +744,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -811,11 +786,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(false);
@@ -856,11 +829,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -901,11 +872,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(false);
@@ -947,11 +916,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -995,11 +962,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -1036,11 +1001,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -1157,12 +1120,10 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS);
         WifiConfiguration wifiConfiguration = WifiConfigurationTestUtil.createPskNetwork();
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
         // request network, trigger scan and get matched set.
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
@@ -1262,10 +1223,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -1311,10 +1271,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -1663,7 +1622,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 mWifiNetworkFactory.getSpecificNetworkRequestUidAndPackageName(
                         new WifiConfiguration()).first);
         assertTrue(mWifiNetworkFactory.getSpecificNetworkRequestUidAndPackageName(
-                        new WifiConfiguration()).second.isEmpty());
+                new WifiConfiguration()).second.isEmpty());
 
         sendNetworkRequestAndSetupForConnectionStatus();
         assertNotNull(mSelectedNetwork);
@@ -1692,8 +1651,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleNewNetworkRequestWithSpecifierWhenScanning() throws Exception {
-        WifiNetworkSpecifier specifier1 = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier1);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Register callback.
@@ -1701,26 +1659,25 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 TEST_CALLBACK_IDENTIFIER);
         verify(mNetworkRequestMatchCallback).onUserSelectionCallbackRegistration(any());
 
+        NetworkRequest oldRequest = new NetworkRequest(mNetworkRequest);
         // Send second request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        NetworkRequest newRequest = new NetworkRequest(mNetworkRequest);
-        newRequest.networkCapabilities.setNetworkSpecifier(specifier2);
-        mWifiNetworkFactory.needNetworkFor(newRequest, 0);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
+        mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mLooper.dispatchAll();
 
         verify(mNetworkRequestMatchCallback).onAbort();
         verify(mWifiScanner, times(2)).getSingleScanResults();
         verify(mWifiScanner, times(2)).startScan(any(), any(), any(), any());
-        verify(mConnectivityManager).declareNetworkRequestUnfulfillable(eq(mNetworkRequest));
+        verify(mConnectivityManager).declareNetworkRequestUnfulfillable(eq(oldRequest));
 
         // Remove the stale request1 & ensure nothing happens.
-        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
+        mWifiNetworkFactory.releaseNetworkFor(oldRequest);
 
         verifyNoMoreInteractions(mWifiConnectivityManager, mWifiScanner, mClientModeImpl,
                 mAlarmManager, mNetworkRequestMatchCallback);
 
         // Remove the active request2 & ensure auto-join is re-enabled.
-        mWifiNetworkFactory.releaseNetworkFor(newRequest);
+        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
 
         verify(mWifiConnectivityManager).setSpecificNetworkRequestInProgress(false);
     }
@@ -1738,11 +1695,10 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 mNetworkRequestUserSelectionCallback.getValue();
         assertNotNull(networkRequestUserSelectionCallback);
 
+        NetworkRequest oldRequest = new NetworkRequest(mNetworkRequest);
         // Send second request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        NetworkRequest newRequest = new NetworkRequest(mNetworkRequest);
-        newRequest.networkCapabilities.setNetworkSpecifier(specifier2);
-        mWifiNetworkFactory.needNetworkFor(newRequest, 0);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
+        mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Ignore stale callbacks.
         WifiConfiguration selectedNetwork = WifiConfigurationTestUtil.createOpenNetwork();
@@ -1753,16 +1709,16 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         verify(mWifiScanner, times(2)).getSingleScanResults();
         verify(mWifiScanner, times(2)).startScan(any(), any(), any(), any());
         verify(mAlarmManager).cancel(mPeriodicScanListenerArgumentCaptor.getValue());
-        verify(mConnectivityManager).declareNetworkRequestUnfulfillable(eq(mNetworkRequest));
+        verify(mConnectivityManager).declareNetworkRequestUnfulfillable(eq(oldRequest));
 
         // Remove the stale request1 & ensure nothing happens.
-        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
+        mWifiNetworkFactory.releaseNetworkFor(oldRequest);
 
         verifyNoMoreInteractions(mWifiConnectivityManager, mWifiScanner, mClientModeImpl,
                 mAlarmManager, mNetworkRequestMatchCallback);
 
         // Remove the active request2 & ensure auto-join is re-enabled.
-        mWifiNetworkFactory.releaseNetworkFor(newRequest);
+        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
 
         verify(mWifiConnectivityManager).setSpecificNetworkRequestInProgress(false);
     }
@@ -1776,11 +1732,10 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiNetworkSpecifier specifier1 =
                 (WifiNetworkSpecifier) mNetworkRequest.networkCapabilities.getNetworkSpecifier();
 
+        NetworkRequest oldRequest = new NetworkRequest(mNetworkRequest);
         // Send second request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        NetworkRequest newRequest = new NetworkRequest(mNetworkRequest);
-        newRequest.networkCapabilities.setNetworkSpecifier(specifier2);
-        mWifiNetworkFactory.needNetworkFor(newRequest, 0);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
+        mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         verify(mNetworkRequestMatchCallback).onAbort();
         verify(mWifiConnectivityManager, times(1)).setSpecificNetworkRequestInProgress(true);
@@ -1789,13 +1744,13 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         verify(mAlarmManager).cancel(mConnectionTimeoutAlarmListenerArgumentCaptor.getValue());
 
         // Remove the stale request1 & ensure nothing happens.
-        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
+        mWifiNetworkFactory.releaseNetworkFor(oldRequest);
 
         verifyNoMoreInteractions(mWifiConnectivityManager, mWifiScanner, mClientModeImpl,
                 mAlarmManager, mNetworkRequestMatchCallback);
 
         // Remove the active request2 & ensure auto-join is re-enabled.
-        mWifiNetworkFactory.releaseNetworkFor(newRequest);
+        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
 
         verify(mWifiConnectivityManager).setSpecificNetworkRequestInProgress(false);
     }
@@ -1816,11 +1771,10 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         // Cancel the connection timeout.
         verify(mAlarmManager).cancel(mConnectionTimeoutAlarmListenerArgumentCaptor.getValue());
 
+        NetworkRequest oldRequest = new NetworkRequest(mNetworkRequest);
         // Send second request.
-        WifiNetworkSpecifier specifier2 = createWifiNetworkSpecifier(TEST_UID_2, false);
-        NetworkRequest newRequest = new NetworkRequest(mNetworkRequest);
-        newRequest.networkCapabilities.setNetworkSpecifier(specifier2);
-        mWifiNetworkFactory.needNetworkFor(newRequest, 0);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_2, false);
+        mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         verify(mWifiConnectivityManager, times(1)).setSpecificNetworkRequestInProgress(true);
         verify(mWifiScanner, times(2)).getSingleScanResults();
@@ -1829,14 +1783,14 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         verify(mClientModeImpl, times(1)).disconnectCommand();
 
         // Remove the connected request1 & ensure we disconnect.
-        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
+        mWifiNetworkFactory.releaseNetworkFor(oldRequest);
         verify(mClientModeImpl, times(2)).disconnectCommand();
 
         verifyNoMoreInteractions(mWifiConnectivityManager, mWifiScanner, mClientModeImpl,
                 mAlarmManager);
 
         // Now remove the active request2 & ensure auto-join is re-enabled.
-        mWifiNetworkFactory.releaseNetworkFor(newRequest);
+        mWifiNetworkFactory.releaseNetworkFor(mNetworkRequest);
 
         verify(mWifiConnectivityManager).setSpecificNetworkRequestInProgress(false);
 
@@ -2017,8 +1971,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         when(mActivityManager.getPackageImportance(TEST_PACKAGE_NAME_1))
                 .thenReturn(IMPORTANCE_FOREGROUND);
 
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         // set wifi off.
         mWifiNetworkFactory.setWifiState(false);
@@ -2034,8 +1987,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleNetworkRequestWithSpecifierWhenWifiOff() {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         // set wifi off
         mWifiNetworkFactory.setWifiState(false);
@@ -2053,8 +2005,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testHandleNetworkRequestWithSpecifierWifiOffWhenScanning() throws Exception {
-        WifiNetworkSpecifier specifier1 = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier1);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Register callback.
@@ -2091,8 +2042,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
      */
     @Test
     public void testFullHandleNetworkRequestWithSpecifierWhenWifiOff() {
-        WifiNetworkSpecifier specifier = createWifiNetworkSpecifier(TEST_UID_1, false);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
+        attachDefaultWifiNetworkSpecifierAndAppInfo(TEST_UID_1, false);
 
         // set wifi off
         mWifiNetworkFactory.setWifiState(false);
@@ -2132,10 +2082,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch,
                 WifiConfigurationTestUtil.createPskNetwork(), TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -2182,10 +2131,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch,
                 WifiConfigurationTestUtil.createPskNetwork(), TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -2224,10 +2172,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, WifiConfigurationTestUtil.createPskNetwork(),
                 TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -2264,10 +2211,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         // match-all.
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, WifiConfigurationTestUtil.createPskNetwork(),
                 TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -2308,10 +2254,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, WifiConfigurationTestUtil.createPskNetwork(),
                 TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -2351,10 +2296,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, WifiConfigurationTestUtil.createPskNetwork(),
                 TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -2419,10 +2363,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(TEST_BSSID_1),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, WifiConfigurationTestUtil.createPskNetwork(),
                 TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
         mWifiNetworkFactory.addCallback(mAppBinder, mNetworkRequestMatchCallback,
                 TEST_CALLBACK_IDENTIFIER);
@@ -2496,10 +2439,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch,
                 WifiConfigurationTestUtil.createPskNetwork(), TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Verify we did not trigger the UI for the second request.
@@ -2547,10 +2489,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch,
                 WifiConfigurationTestUtil.createPskNetwork(), TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Verify we did not trigger the UI for the second request.
@@ -2593,7 +2534,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         when(mClock.getElapsedSinceBootMillis())
                 .thenReturn(Long.valueOf(
                         scanResultsTimestampInUs / 1000
-                        + WifiNetworkFactory.CACHED_SCAN_RESULTS_MAX_AGE_IN_MILLIS + 1));
+                                + WifiNetworkFactory.CACHED_SCAN_RESULTS_MAX_AGE_IN_MILLIS + 1));
         // Simulate the cached results matching.
         when(mWifiScanner.getSingleScanResults())
                 .thenReturn(Arrays.asList(mTestScanDatas[0].getResults()));
@@ -2603,10 +2544,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         Pair<MacAddress, MacAddress> bssidPatternMatch =
                 Pair.create(MacAddress.fromString(matchingScanResult.BSSID),
                         MacAddress.BROADCAST_ADDRESS);
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch,
                 WifiConfigurationTestUtil.createPskNetwork(), TEST_UID_1, TEST_PACKAGE_NAME_1);
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         // Ensure we brought up the UI while the scan is ongoing.
@@ -2648,11 +2588,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(mNetworkRequest, 0);
 
         validateUiStartParams(true);
@@ -2734,11 +2672,9 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
                 Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS);
         WifiConfiguration wifiConfiguration = WifiConfigurationTestUtil.createPskNetwork();
         wifiConfiguration.preSharedKey = TEST_WPA_PRESHARED_KEY;
-        WifiNetworkSpecifier specifier = new WifiNetworkSpecifier(
+        attachWifiNetworkSpecifierAndAppInfo(
                 ssidPatternMatch, bssidPatternMatch, wifiConfiguration, TEST_UID_1,
                 TEST_PACKAGE_NAME_1);
-
-        mNetworkRequest.networkCapabilities.setNetworkSpecifier(specifier);
         mWifiNetworkFactory.needNetworkFor(new NetworkRequest(mNetworkRequest), 0);
 
         validateUiStartParams(true);
@@ -2796,7 +2732,7 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         mInOrder.verifyNoMoreInteractions();
     }
 
-    private WifiNetworkSpecifier createWifiNetworkSpecifier(int uid, boolean isHidden) {
+    private void attachDefaultWifiNetworkSpecifierAndAppInfo(int uid, boolean isHidden) {
         PatternMatcher ssidPatternMatch =
                 new PatternMatcher(TEST_SSID_1, PatternMatcher.PATTERN_LITERAL);
         Pair<MacAddress, MacAddress> bssidPatternMatch =
@@ -2815,8 +2751,20 @@ public class WifiNetworkFactoryTest extends WifiBaseTest {
         } else {
             fail();
         }
-        return new WifiNetworkSpecifier(
-                ssidPatternMatch, bssidPatternMatch, wifiConfiguration, uid, packageName);
+        attachWifiNetworkSpecifierAndAppInfo(ssidPatternMatch, bssidPatternMatch, wifiConfiguration,
+                uid, packageName);
+    }
+
+    private void attachWifiNetworkSpecifierAndAppInfo(
+            PatternMatcher ssidPatternMatch, Pair<MacAddress, MacAddress> bssidPatternMatch,
+            WifiConfiguration wifiConfiguration, int uid, String packageName) {
+        mNetworkCapabilities.setRequestorUid(uid);
+        mNetworkCapabilities.setRequestorPackageName(packageName);
+        mNetworkCapabilities.setNetworkSpecifier(
+                new WifiNetworkSpecifier(ssidPatternMatch, bssidPatternMatch, wifiConfiguration));
+        mNetworkRequest = new NetworkRequest.Builder()
+                .setCapabilities(mNetworkCapabilities)
+                .build();
     }
 
     private static final int SCAN_RESULT_TYPE_OPEN = 0;
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index 8b239dabe..8dafc7674 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -1154,9 +1154,9 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
                 ns.pmk,
                 ns.passphrase,
                 0,
-                0,
-                ns.requestorUid);
+                0);
         nr.networkCapabilities.setNetworkSpecifier(ns);
+        nr.networkCapabilities.setRequestorUid(0);
 
         Message reqNetworkMsg = Message.obtain();
         reqNetworkMsg.what = NetworkProvider.CMD_REQUEST_NETWORK;
@@ -1213,9 +1213,9 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
                 ns.pmk,
                 ns.passphrase,
                 0,
-                0,
-                ns.requestorUid + 1); // corruption hack
+                0);
         nr.networkCapabilities.setNetworkSpecifier(ns);
+        nr.networkCapabilities.setRequestorUid(0 + 1); // corruption hack
 
         // (3) request network
         Message reqNetworkMsg = Message.obtain();
@@ -1622,6 +1622,7 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
         nc.setLinkUpstreamBandwidthKbps(1);
         nc.setLinkDownstreamBandwidthKbps(1);
         nc.setSignalStrength(1);
+        nc.setRequestorUid(Process.myUid());
 
         return new NetworkRequest(nc, 0, requestId, NetworkRequest.Type.REQUEST);
     }
@@ -1672,6 +1673,7 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
         nc.setLinkUpstreamBandwidthKbps(1);
         nc.setLinkDownstreamBandwidthKbps(1);
         nc.setSignalStrength(1);
+        nc.setRequestorUid(Process.myUid());
 
         return new NetworkRequest(nc, 0, requestId, NetworkRequest.Type.REQUEST);
     }
@@ -1806,8 +1808,7 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
                 pmk,
                 passphrase,
                 port,
-                transportProtocol,
-                Process.myUid());
+                transportProtocol);
     }
 
     /**
@@ -1827,8 +1828,7 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
                 pmk,
                 passphrase,
                 port,
-                transportProtocol,
-                Process.myUid());
+                transportProtocol);
     }
 
     private static class DataPathEndPointInfo {
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java
index b0db9646e..9bc5ffbf3 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java
@@ -672,7 +672,7 @@ public class WifiAwareMetricsTest extends WifiBaseTest {
                     .AwareNetworkRequestInformation> networkRequestCache,
             int index, int uid, String interfaceName, String passphrase) {
         WifiAwareNetworkSpecifier ns = new WifiAwareNetworkSpecifier(0, 0, 0, index, 0, null, null,
-                passphrase, 0, 0, 0);
+                passphrase, 0, 0);
         WifiAwareDataPathStateManager.AwareNetworkRequestInformation anri =
                 new WifiAwareDataPathStateManager.AwareNetworkRequestInformation();
         anri.networkSpecifier = ns;