Merge "hotspot2: track creator UID for installed providers" into oc-dev

4 files changed, 30 insertions, 26 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index c901227e0..3b108dc44 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -1166,19 +1166,19 @@ public class WifiStateMachineTest {
      */
     @Test
     public void syncAddOrUpdatePasspointConfig() throws Exception {
-        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class)))
-                .thenReturn(true);
+        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class),
+                eq(MANAGED_PROFILE_UID))).thenReturn(true);
         mLooper.startAutoDispatch();
         assertTrue(mWsm.syncAddOrUpdatePasspointConfig(mWsmAsyncChannel,
-                new PasspointConfiguration()));
+                new PasspointConfiguration(), MANAGED_PROFILE_UID));
         mLooper.stopAutoDispatch();
         reset(mPasspointManager);
 
-        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class)))
-                .thenReturn(false);
+        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class),
+                eq(MANAGED_PROFILE_UID))).thenReturn(false);
         mLooper.startAutoDispatch();
         assertFalse(mWsm.syncAddOrUpdatePasspointConfig(mWsmAsyncChannel,
-                new PasspointConfiguration()));
+                new PasspointConfiguration(), MANAGED_PROFILE_UID));
         mLooper.stopAutoDispatch();
     }
 
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigStoreDataTest.java
index 5b2eabfd3..cd3120f9e 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigStoreDataTest.java
@@ -59,6 +59,7 @@ public class PasspointConfigStoreDataTest {
     private static final String TEST_CLIENT_CERTIFICATE_ALIAS = "ClientCert";
     private static final String TEST_CLIENT_PRIVATE_KEY_ALIAS = "ClientPrivateKey";
     private static final long TEST_PROVIDER_ID = 1;
+    private static final int TEST_CREATOR_UID = 1234;
 
     @Mock WifiKeyStore mKeyStore;
     @Mock SIMAccessor mSimAccessor;
@@ -234,8 +235,9 @@ public class PasspointConfigStoreDataTest {
         // Setup expected data.
         List<PasspointProvider> providerList = new ArrayList<>();
         providerList.add(new PasspointProvider(createFullPasspointConfiguration(),
-                mKeyStore, mSimAccessor, TEST_PROVIDER_ID, TEST_CA_CERTIFICATE_ALIAS,
-                TEST_CLIENT_CERTIFICATE_ALIAS, TEST_CLIENT_PRIVATE_KEY_ALIAS));
+                mKeyStore, mSimAccessor, TEST_PROVIDER_ID, TEST_CREATOR_UID,
+                TEST_CA_CERTIFICATE_ALIAS, TEST_CLIENT_CERTIFICATE_ALIAS,
+                TEST_CLIENT_PRIVATE_KEY_ALIAS));
 
         // Serialize data for user store.
         when(mDataSource.getProviders()).thenReturn(providerList);
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
index 28d7e2df0..c8ca7139d 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
@@ -106,6 +106,7 @@ public class PasspointManagerTest {
     private static final int TEST_ANQP_DOMAIN_ID = 0;
     private static final ANQPNetworkKey TEST_ANQP_KEY = ANQPNetworkKey.buildKey(
             TEST_SSID, TEST_BSSID, TEST_HESSID, TEST_ANQP_DOMAIN_ID);
+    private static final int TEST_CREATOR_UID = 1234;
 
     @Mock Context mContext;
     @Mock WifiNative mWifiNative;
@@ -248,8 +249,8 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithUserCredential();
         PasspointProvider provider = createMockProvider(config);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong())).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config));
+                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
 
         return provider;
     }
@@ -399,7 +400,7 @@ public class PasspointManagerTest {
      */
     @Test
     public void addProviderWithNullConfig() throws Exception {
-        assertFalse(mManager.addOrUpdateProvider(null));
+        assertFalse(mManager.addOrUpdateProvider(null, TEST_CREATOR_UID));
     }
 
     /**
@@ -409,7 +410,7 @@ public class PasspointManagerTest {
      */
     @Test
     public void addProviderWithEmptyConfig() throws Exception {
-        assertFalse(mManager.addOrUpdateProvider(new PasspointConfiguration()));
+        assertFalse(mManager.addOrUpdateProvider(new PasspointConfiguration(), TEST_CREATOR_UID));
     }
 
     /**
@@ -423,7 +424,7 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithUserCredential();
         // EAP-TLS not allowed for user credential.
         config.getCredential().getUserCredential().setEapType(EAPConstants.EAP_TLS);
-        assertFalse(mManager.addOrUpdateProvider(config));
+        assertFalse(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
     }
 
     /**
@@ -436,8 +437,8 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithUserCredential();
         PasspointProvider provider = createMockProvider(config);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong())).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config));
+                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
         verifyInstalledConfig(config);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
@@ -471,8 +472,8 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithSimCredential();
         PasspointProvider provider = createMockProvider(config);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong())).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config));
+                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
         verifyInstalledConfig(config);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
@@ -509,8 +510,8 @@ public class PasspointManagerTest {
         PasspointConfiguration origConfig = createTestConfigWithSimCredential();
         PasspointProvider origProvider = createMockProvider(origConfig);
         when(mObjectFactory.makePasspointProvider(eq(origConfig), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong())).thenReturn(origProvider);
-        assertTrue(mManager.addOrUpdateProvider(origConfig));
+                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(origProvider);
+        assertTrue(mManager.addOrUpdateProvider(origConfig, TEST_CREATOR_UID));
         verifyInstalledConfig(origConfig);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
@@ -526,8 +527,8 @@ public class PasspointManagerTest {
         PasspointConfiguration newConfig = createTestConfigWithUserCredential();
         PasspointProvider newProvider = createMockProvider(newConfig);
         when(mObjectFactory.makePasspointProvider(eq(newConfig), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong())).thenReturn(newProvider);
-        assertTrue(mManager.addOrUpdateProvider(newConfig));
+                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(newProvider);
+        assertTrue(mManager.addOrUpdateProvider(newConfig, TEST_CREATOR_UID));
         verifyInstalledConfig(newConfig);
         verify(mWifiConfigManager).saveToStore(true);
 
@@ -550,8 +551,8 @@ public class PasspointManagerTest {
         PasspointProvider provider = mock(PasspointProvider.class);
         when(provider.installCertsAndKeys()).thenReturn(false);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong())).thenReturn(provider);
-        assertFalse(mManager.addOrUpdateProvider(config));
+                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
+        assertFalse(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
     }
 
     /**
@@ -814,8 +815,8 @@ public class PasspointManagerTest {
         PasspointProvider provider = createMockProvider(config);
         // Verify the provider ID used to create the new provider.
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), eq(providerIndex))).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config));
+                eq(mSimAccessor), eq(providerIndex), eq(TEST_CREATOR_UID))).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
         verifyInstalledConfig(config);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
index afa04b549..c416a961a 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
@@ -67,6 +67,7 @@ import java.util.Set;
 @SmallTest
 public class PasspointProviderTest {
     private static final long PROVIDER_ID = 12L;
+    private static final int CREATOR_UID = 1234;
     private static final String CA_CERTIFICATE_NAME = "CACERT_HS2_12";
     private static final String CLIENT_CERTIFICATE_NAME = "USRCERT_HS2_12";
     private static final String CLIENT_PRIVATE_KEY_NAME = "USRPKEY_HS2_12";
@@ -91,7 +92,7 @@ public class PasspointProviderTest {
      * @return {@link com.android.server.wifi.hotspot2.PasspointProvider}
      */
     private PasspointProvider createProvider(PasspointConfiguration config) {
-        return new PasspointProvider(config, mKeyStore, mSimAccessor, PROVIDER_ID);
+        return new PasspointProvider(config, mKeyStore, mSimAccessor, PROVIDER_ID, CREATOR_UID);
     }
 
     /**