Refactor AdId / AppSetId getInstance() methods.
They don't take a context anymore, but rather use
ApplicationContextSingleton.get()
Test: atest AdServicesServiceCoreAdIdUnitTests AdServicesServiceCoreAppsetIdUnitTests AdServicesApkUnitTests:AppSetIdServiceTest AdExtServicesApkUnitTests:AppSetIdServiceTest
Bug: 311183933
Change-Id: I66fff266be94895182fca08a1e6b933c79dc2467
diff --git a/adservices/apk/java/com/android/adservices/adid/AdIdService.java b/adservices/apk/java/com/android/adservices/adid/AdIdService.java
index b0a9ad9..80b4af0 100644
--- a/adservices/apk/java/com/android/adservices/adid/AdIdService.java
+++ b/adservices/apk/java/com/android/adservices/adid/AdIdService.java
@@ -59,7 +59,7 @@
mAdIdService =
new AdIdServiceImpl(
this,
- AdIdWorker.getInstance(this),
+ AdIdWorker.getInstance(),
AdServicesLoggerImpl.getInstance(),
Clock.SYSTEM_CLOCK,
FlagsFactory.getFlags(),
diff --git a/adservices/apk/java/com/android/adservices/appsetid/AppSetIdService.java b/adservices/apk/java/com/android/adservices/appsetid/AppSetIdService.java
index 19f8bb7..891ed8d 100644
--- a/adservices/apk/java/com/android/adservices/appsetid/AppSetIdService.java
+++ b/adservices/apk/java/com/android/adservices/appsetid/AppSetIdService.java
@@ -59,7 +59,7 @@
mAppSetIdService =
new AppSetIdServiceImpl(
this,
- AppSetIdWorker.getInstance(this),
+ AppSetIdWorker.getInstance(),
AdServicesLoggerImpl.getInstance(),
Clock.SYSTEM_CLOCK,
FlagsFactory.getFlags(),
diff --git a/adservices/apk/java/com/android/adservices/common/AdServicesCommonService.java b/adservices/apk/java/com/android/adservices/common/AdServicesCommonService.java
index 628acc7..21db5ec 100644
--- a/adservices/apk/java/com/android/adservices/common/AdServicesCommonService.java
+++ b/adservices/apk/java/com/android/adservices/common/AdServicesCommonService.java
@@ -57,7 +57,7 @@
FlagsFactory.getFlags(),
UxEngine.getInstance(this),
UxStatesManager.getInstance(this),
- AdIdWorker.getInstance(this));
+ AdIdWorker.getInstance());
}
LogUtil.d("created adservices common service");
try {
diff --git a/adservices/apk/unittest/src/com/android/adservices/adid/AdIdServiceTest.java b/adservices/apk/unittest/src/com/android/adservices/adid/AdIdServiceTest.java
index 78cc913..af05898 100644
--- a/adservices/apk/unittest/src/com/android/adservices/adid/AdIdServiceTest.java
+++ b/adservices/apk/unittest/src/com/android/adservices/adid/AdIdServiceTest.java
@@ -85,8 +85,7 @@
// Mock static method FlagsFactory.getFlags() to return Mock Flags.
ExtendedMockito.doReturn(mMockFlags).when(FlagsFactory::getFlags);
- ExtendedMockito.doReturn(mMockAdIdWorker)
- .when(() -> AdIdWorker.getInstance(any(Context.class)));
+ ExtendedMockito.doReturn(mMockAdIdWorker).when(() -> AdIdWorker.getInstance());
AdIdService spyAdIdService = spy(new AdIdService());
doReturn(mMockPackageManager).when(spyAdIdService).getPackageManager();
diff --git a/adservices/apk/unittest/src/com/android/adservices/appsetid/AppSetIdServiceTest.java b/adservices/apk/unittest/src/com/android/adservices/appsetid/AppSetIdServiceTest.java
index 923201d..bd067ff 100644
--- a/adservices/apk/unittest/src/com/android/adservices/appsetid/AppSetIdServiceTest.java
+++ b/adservices/apk/unittest/src/com/android/adservices/appsetid/AppSetIdServiceTest.java
@@ -84,8 +84,7 @@
// Mock static method FlagsFactory.getFlags() to return Mock Flags.
ExtendedMockito.doReturn(mMockFlags).when(FlagsFactory::getFlags);
- ExtendedMockito.doReturn(mMockAppSetIdWorker)
- .when(() -> AppSetIdWorker.getInstance(any(Context.class)));
+ ExtendedMockito.doReturn(mMockAppSetIdWorker).when(() -> AppSetIdWorker.getInstance());
AppSetIdService spyAppSetIdService = spy(new AppSetIdService());
doReturn(mMockPackageManager).when(spyAppSetIdService).getPackageManager();
ExtendedMockito.doReturn(mMockAppImportanceFilter)
diff --git a/adservices/service-core/java/com/android/adservices/service/adid/AdIdCacheManager.java b/adservices/service-core/java/com/android/adservices/service/adid/AdIdCacheManager.java
index 5e89bc1..f86e288 100644
--- a/adservices/service-core/java/com/android/adservices/service/adid/AdIdCacheManager.java
+++ b/adservices/service-core/java/com/android/adservices/service/adid/AdIdCacheManager.java
@@ -39,6 +39,7 @@
import com.android.adservices.ServiceBinder;
import com.android.adservices.errorlogging.ErrorLogUtil;
import com.android.adservices.service.FlagsFactory;
+import com.android.adservices.shared.common.ApplicationContextSingleton;
import com.android.internal.annotations.VisibleForTesting;
import java.util.Objects;
@@ -76,10 +77,10 @@
}
/** Gets a singleton instance of {@link AdIdCacheManager}. */
- public static AdIdCacheManager getInstance(Context context) {
+ public static AdIdCacheManager getInstance() {
synchronized (SINGLETON_LOCK) {
if (sSingleton == null) {
- sSingleton = new AdIdCacheManager(context);
+ sSingleton = new AdIdCacheManager(ApplicationContextSingleton.get());
}
return sSingleton;
diff --git a/adservices/service-core/java/com/android/adservices/service/adid/AdIdWorker.java b/adservices/service-core/java/com/android/adservices/service/adid/AdIdWorker.java
index 86f723c..c767577 100644
--- a/adservices/service-core/java/com/android/adservices/service/adid/AdIdWorker.java
+++ b/adservices/service-core/java/com/android/adservices/service/adid/AdIdWorker.java
@@ -20,7 +20,6 @@
import android.adservices.common.UpdateAdIdRequest;
import android.annotation.NonNull;
import android.annotation.WorkerThread;
-import android.content.Context;
import com.android.adservices.LogUtil;
import com.android.internal.annotations.VisibleForTesting;
@@ -56,11 +55,11 @@
* existing instance will be returned.
*/
@NonNull
- public static AdIdWorker getInstance(Context context) {
+ public static AdIdWorker getInstance() {
if (sAdIdWorker == null) {
synchronized (AdIdWorker.class) {
if (sAdIdWorker == null) {
- sAdIdWorker = new AdIdWorker(AdIdCacheManager.getInstance(context));
+ sAdIdWorker = new AdIdWorker(AdIdCacheManager.getInstance());
}
}
}
diff --git a/adservices/service-core/java/com/android/adservices/service/adselection/AdSelectionServiceImpl.java b/adservices/service-core/java/com/android/adservices/service/adselection/AdSelectionServiceImpl.java
index 49e3471..2bfc9fc 100644
--- a/adservices/service-core/java/com/android/adservices/service/adselection/AdSelectionServiceImpl.java
+++ b/adservices/service-core/java/com/android/adservices/service/adselection/AdSelectionServiceImpl.java
@@ -297,7 +297,7 @@
AdSelectionDebugReportingDatabase.getInstance(context)
.getAdSelectionDebugReportDao(),
new AdIdFetcher(
- AdIdWorker.getInstance(context),
+ AdIdWorker.getInstance(),
AdServicesExecutors.getLightWeightExecutor(),
AdServicesExecutors.getScheduler()),
BinderFlagReader.readFlag(
diff --git a/adservices/service-core/java/com/android/adservices/service/appsetid/AppSetIdWorker.java b/adservices/service-core/java/com/android/adservices/service/appsetid/AppSetIdWorker.java
index 4359284..7ebc86d 100644
--- a/adservices/service-core/java/com/android/adservices/service/appsetid/AppSetIdWorker.java
+++ b/adservices/service-core/java/com/android/adservices/service/appsetid/AppSetIdWorker.java
@@ -37,6 +37,7 @@
import com.android.adservices.errorlogging.ErrorLogUtil;
import com.android.adservices.service.Flags;
import com.android.adservices.service.FlagsFactory;
+import com.android.adservices.shared.common.ApplicationContextSingleton;
import com.android.internal.annotations.VisibleForTesting;
import java.util.Objects;
@@ -79,11 +80,13 @@
* existing instance will be returned.
*/
@NonNull
- public static AppSetIdWorker getInstance(Context context) {
+ public static AppSetIdWorker getInstance() {
if (sAppSetIdWorker == null) {
synchronized (AppSetIdWorker.class) {
if (sAppSetIdWorker == null) {
- sAppSetIdWorker = new AppSetIdWorker(context, FlagsFactory.getFlags());
+ sAppSetIdWorker =
+ new AppSetIdWorker(
+ ApplicationContextSingleton.get(), FlagsFactory.getFlags());
}
}
}
diff --git a/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdServiceImplTest.java b/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdServiceImplTest.java
index 994514d..975f4a5 100644
--- a/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdServiceImplTest.java
+++ b/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdServiceImplTest.java
@@ -54,12 +54,14 @@
import com.android.adservices.service.stats.AdServicesLoggerImpl;
import com.android.adservices.service.stats.ApiCallStats;
import com.android.adservices.service.stats.Clock;
+import com.android.adservices.shared.testing.common.ApplicationContextSingletonRule;
import com.android.dx.mockito.inline.extended.ExtendedMockito;
import com.android.modules.utils.build.SdkLevel;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
@@ -100,13 +102,14 @@
@Mock private AppSetIdServiceImpl mAppSetIdServiceImpl;
@Mock private AppImportanceFilter mMockAppImportanceFilter;
+ @Rule
+ public final ApplicationContextSingletonRule appContext = new ApplicationContextSingletonRule();
+
@Before
public void setup() throws Exception {
MockitoAnnotations.initMocks(this);
- mAppSetIdWorker =
- Mockito.spy(
- AppSetIdWorker.getInstance(ApplicationProvider.getApplicationContext()));
+ mAppSetIdWorker = Mockito.spy(AppSetIdWorker.getInstance());
Mockito.doReturn(null).when(mAppSetIdWorker).getService();
when(mClock.elapsedRealtime()).thenReturn(150L, 200L);
diff --git a/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdWorkerTest.java b/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdWorkerTest.java
index f422c6f..ef6c093 100644
--- a/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdWorkerTest.java
+++ b/adservices/tests/unittest/service-core/appsetid/src/com/android/adservices/service/appsetid/AppSetIdWorkerTest.java
@@ -24,9 +24,10 @@
import android.annotation.NonNull;
import android.os.RemoteException;
-import androidx.test.core.app.ApplicationProvider;
+import com.android.adservices.shared.testing.common.ApplicationContextSingletonRule;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mockito;
@@ -39,15 +40,16 @@
private static final String DEFAULT_APP_SET_ID = "00000000-0000-0000-0000-000000000000";
+ @Rule
+ public final ApplicationContextSingletonRule appContext = new ApplicationContextSingletonRule();
+
@Test
public void testGetAppSetIdOnResult() throws Exception {
mTestSuccess = true;
CompletableFuture<GetAppSetIdResult> future = new CompletableFuture<>();
- AppSetIdWorker spyWorker =
- Mockito.spy(
- AppSetIdWorker.getInstance(ApplicationProvider.getApplicationContext()));
+ AppSetIdWorker spyWorker = Mockito.spy(AppSetIdWorker.getInstance());
Mockito.doReturn(mInterface).when(spyWorker).getService();
spyWorker.getAppSetId(
@@ -77,9 +79,7 @@
CompletableFuture<Integer> future = new CompletableFuture<>();
- AppSetIdWorker spyWorker =
- Mockito.spy(
- AppSetIdWorker.getInstance(ApplicationProvider.getApplicationContext()));
+ AppSetIdWorker spyWorker = Mockito.spy(AppSetIdWorker.getInstance());
Mockito.doReturn(mInterface).when(spyWorker).getService();
spyWorker.getAppSetId(
