Revert "hotspot2: track creator UID for installed providers"

This reverts commit 2e60a41775fc66f245e7413db72002aebe69e823.

Change-Id: Ifa60c015adb2bac7d91d000ea21e53d1217bb72f

4 files changed, 26 insertions, 30 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 107e43078..cc8535318 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),
-                eq(MANAGED_PROFILE_UID))).thenReturn(true);
+        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class)))
+                .thenReturn(true);
         mLooper.startAutoDispatch();
         assertTrue(mWsm.syncAddOrUpdatePasspointConfig(mWsmAsyncChannel,
-                new PasspointConfiguration(), MANAGED_PROFILE_UID));
+                new PasspointConfiguration()));
         mLooper.stopAutoDispatch();
         reset(mPasspointManager);
 
-        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class),
-                eq(MANAGED_PROFILE_UID))).thenReturn(false);
+        when(mPasspointManager.addOrUpdateProvider(any(PasspointConfiguration.class)))
+                .thenReturn(false);
         mLooper.startAutoDispatch();
         assertFalse(mWsm.syncAddOrUpdatePasspointConfig(mWsmAsyncChannel,
-                new PasspointConfiguration(), MANAGED_PROFILE_UID));
+                new PasspointConfiguration()));
         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 cd3120f9e..5b2eabfd3 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigStoreDataTest.java
@@ -59,7 +59,6 @@ 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;
@@ -235,9 +234,8 @@ public class PasspointConfigStoreDataTest {
         // Setup expected data.
         List<PasspointProvider> providerList = new ArrayList<>();
         providerList.add(new PasspointProvider(createFullPasspointConfiguration(),
-                mKeyStore, mSimAccessor, TEST_PROVIDER_ID, TEST_CREATOR_UID,
-                TEST_CA_CERTIFICATE_ALIAS, TEST_CLIENT_CERTIFICATE_ALIAS,
-                TEST_CLIENT_PRIVATE_KEY_ALIAS));
+                mKeyStore, mSimAccessor, TEST_PROVIDER_ID, 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 6e197efcf..8008bf68e 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
@@ -103,7 +103,6 @@ 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;
@@ -244,8 +243,8 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithUserCredential();
         PasspointProvider provider = createMockProvider(config);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
+                eq(mSimAccessor), anyLong())).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config));
 
         return provider;
     }
@@ -395,7 +394,7 @@ public class PasspointManagerTest {
      */
     @Test
     public void addProviderWithNullConfig() throws Exception {
-        assertFalse(mManager.addOrUpdateProvider(null, TEST_CREATOR_UID));
+        assertFalse(mManager.addOrUpdateProvider(null));
     }
 
     /**
@@ -405,7 +404,7 @@ public class PasspointManagerTest {
      */
     @Test
     public void addProviderWithEmptyConfig() throws Exception {
-        assertFalse(mManager.addOrUpdateProvider(new PasspointConfiguration(), TEST_CREATOR_UID));
+        assertFalse(mManager.addOrUpdateProvider(new PasspointConfiguration()));
     }
 
     /**
@@ -419,7 +418,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, TEST_CREATOR_UID));
+        assertFalse(mManager.addOrUpdateProvider(config));
     }
 
     /**
@@ -432,8 +431,8 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithUserCredential();
         PasspointProvider provider = createMockProvider(config);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
+                eq(mSimAccessor), anyLong())).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config));
         verifyInstalledConfig(config);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
@@ -467,8 +466,8 @@ public class PasspointManagerTest {
         PasspointConfiguration config = createTestConfigWithSimCredential();
         PasspointProvider provider = createMockProvider(config);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
+                eq(mSimAccessor), anyLong())).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config));
         verifyInstalledConfig(config);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
@@ -505,8 +504,8 @@ public class PasspointManagerTest {
         PasspointConfiguration origConfig = createTestConfigWithSimCredential();
         PasspointProvider origProvider = createMockProvider(origConfig);
         when(mObjectFactory.makePasspointProvider(eq(origConfig), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(origProvider);
-        assertTrue(mManager.addOrUpdateProvider(origConfig, TEST_CREATOR_UID));
+                eq(mSimAccessor), anyLong())).thenReturn(origProvider);
+        assertTrue(mManager.addOrUpdateProvider(origConfig));
         verifyInstalledConfig(origConfig);
         verify(mWifiConfigManager).saveToStore(true);
         reset(mWifiConfigManager);
@@ -522,8 +521,8 @@ public class PasspointManagerTest {
         PasspointConfiguration newConfig = createTestConfigWithUserCredential();
         PasspointProvider newProvider = createMockProvider(newConfig);
         when(mObjectFactory.makePasspointProvider(eq(newConfig), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(newProvider);
-        assertTrue(mManager.addOrUpdateProvider(newConfig, TEST_CREATOR_UID));
+                eq(mSimAccessor), anyLong())).thenReturn(newProvider);
+        assertTrue(mManager.addOrUpdateProvider(newConfig));
         verifyInstalledConfig(newConfig);
         verify(mWifiConfigManager).saveToStore(true);
 
@@ -546,8 +545,8 @@ public class PasspointManagerTest {
         PasspointProvider provider = mock(PasspointProvider.class);
         when(provider.installCertsAndKeys()).thenReturn(false);
         when(mObjectFactory.makePasspointProvider(eq(config), eq(mWifiKeyStore),
-                eq(mSimAccessor), anyLong(), eq(TEST_CREATOR_UID))).thenReturn(provider);
-        assertFalse(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
+                eq(mSimAccessor), anyLong())).thenReturn(provider);
+        assertFalse(mManager.addOrUpdateProvider(config));
     }
 
     /**
@@ -777,8 +776,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), eq(TEST_CREATOR_UID))).thenReturn(provider);
-        assertTrue(mManager.addOrUpdateProvider(config, TEST_CREATOR_UID));
+                eq(mSimAccessor), eq(providerIndex))).thenReturn(provider);
+        assertTrue(mManager.addOrUpdateProvider(config));
         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 48a9889ca..7551bc049 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
@@ -67,7 +67,6 @@ 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";
@@ -92,7 +91,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, CREATOR_UID);
+        return new PasspointProvider(config, mKeyStore, mSimAccessor, PROVIDER_ID);
     }
 
     /**