Check if WorkSource contains calling app
As the uid and package name in WorkSource is sorted by uid, use add
WorkSource to check if calling app is in the WorkSource
Bug: 244752508
Test: atest com.android.server.wifi
Change-Id: I7ce45c90c58dee80429d1f9a7ba23913e2aa04e7
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 5acded5..6fda6ef 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -4064,11 +4064,11 @@
for (ConcreteClientModeManager cmm : secondaryCmms) {
WorkSource reqWs = cmm.getRequestorWs();
+ WorkSource withCaller = new WorkSource(reqWs);
+ withCaller.add(new WorkSource(callingUid, callingPackageName));
// If there are more than 1 secondary CMM for same app, return any one (should not
// happen currently since we don't support 3 STA's concurrently).
- if (reqWs.equals(new WorkSource(callingUid, callingPackageName))
- || (TextUtils.equals(reqWs.getPackageName(0), callingPackageName)
- && reqWs.getUid(0) == callingUid)) {
+ if (reqWs.equals(withCaller)) {
mLog.info("getConnectionInfo providing secondary CMM info").flush();
return cmm;
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index 8e91380..13c40d7 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -318,6 +318,8 @@
private Bundle mAttribution = new Bundle();
private static final String DPP_URI = "DPP:some_dpp_uri";
private static final String DPP_PRODUCT_INFO = "DPP:some_dpp_uri_info";
+ private static final WorkSource SETTINGS_WORKSOURCE =
+ new WorkSource(Process.SYSTEM_UID, "system-service");
private final ArgumentCaptor<BroadcastReceiver> mBroadcastReceiverCaptor =
ArgumentCaptor.forClass(BroadcastReceiver.class);
@@ -2822,6 +2824,36 @@
}
/**
+ * Test that connected SSID and BSSID for secondary CMM are exposed to an app that requests
+ * the second STA on a device that supports STA + STA. The request WorkSource of CMM is settings
+ * promoted.
+ */
+ @Test
+ public void testConnectedIdsAreVisibleFromAppRequestingSecondaryCmmWIthPromotesSettingsWs()
+ throws Exception {
+ WifiInfo wifiInfo = setupForGetConnectionInfo();
+ ConcreteClientModeManager secondaryCmm = mock(ConcreteClientModeManager.class);
+ WorkSource ws = new WorkSource(Binder.getCallingUid(), TEST_PACKAGE);
+ ws.add(SETTINGS_WORKSOURCE);
+ when(secondaryCmm.getRequestorWs()).thenReturn(ws);
+ when(secondaryCmm.syncRequestConnectionInfo()).thenReturn(wifiInfo);
+ when(mActiveModeWarden.getClientModeManagersInRoles(
+ ROLE_CLIENT_LOCAL_ONLY, ROLE_CLIENT_SECONDARY_LONG_LIVED))
+ .thenReturn(Arrays.asList(secondaryCmm));
+
+ mLooper.startAutoDispatch();
+ WifiInfo connectionInfo = parcelingRoundTrip(
+ mWifiServiceImpl.getConnectionInfo(TEST_PACKAGE, TEST_FEATURE_ID));
+ mLooper.stopAutoDispatchAndIgnoreExceptions();
+
+ assertEquals(TEST_SSID_WITH_QUOTES, connectionInfo.getSSID());
+ assertEquals(TEST_BSSID, connectionInfo.getBSSID());
+ assertEquals(TEST_NETWORK_ID, connectionInfo.getNetworkId());
+ assertEquals(TEST_FQDN, connectionInfo.getPasspointFqdn());
+ assertEquals(TEST_FRIENDLY_NAME, connectionInfo.getPasspointProviderFriendlyName());
+ }
+
+ /**
* Test that connected SSID and BSSID for primary CMM are exposed to an app that is not the one
* that requests the second STA on a device that supports STA + STA.
*/
