update

Author: VinayGuthal

firebase-common/src/main/java/com/google/firebase/platforminfo/GlobalLibraryVersionRegistrar.java

@@ -17,6 +17,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.logging.Logger;
 
 /**
  * In order to allow the C++ and Unity SDKs to publish their versions without the use of the
@@ -28,6 +29,7 @@
 public class GlobalLibraryVersionRegistrar {
   private final Set<LibraryVersion> infos = new HashSet<>();
   private static volatile GlobalLibraryVersionRegistrar INSTANCE;
+  private static final Logger LOGGER = Logger.getLogger(GlobalLibraryVersionRegistrar.class.getName());
 
   GlobalLibraryVersionRegistrar() {}
 
@@ -37,7 +39,9 @@ public class GlobalLibraryVersionRegistrar {
    * <p>It is the responsibility of the caller to register the version at app launch.
    */
   public void registerVersion(String sdkName, String version) {
+
     synchronized (infos) {
+      LOGGER.info("Registering version");
       infos.add(LibraryVersion.create(sdkName, version));
     }
   }

firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestPublicApi.java

@@ -63,16 +63,16 @@ public void listModels() throws ExecutionException, InterruptedException {
     Tasks.await(modelSetTask);
     assertEquals(modelSetTask.getResult().size(), 0);
 
-    Task<CustomModel> modelTask =
-        FirebaseModelDownloader.getInstance()
-            .getModel(
-                MODEL_NAME_LOCAL,
-                DownloadType.LATEST_MODEL,
-                new CustomModelDownloadConditions.Builder().build());
-    Tasks.await(modelTask);
-    assertTrue(modelTask.isSuccessful());
+//    Task<CustomModel> modelTask =
+//        FirebaseModelDownloader.getInstance()
+//            .getModel(
+//                MODEL_NAME_LOCAL,
+//                DownloadType.LATEST_MODEL,
+//                new CustomModelDownloadConditions.Builder().build());
+//    Tasks.await(modelTask);
+//    assertTrue(modelTask.isSuccessful());
 
-    modelTask =
+    Task<CustomModel> modelTask =
         FirebaseModelDownloader.getInstance()
             .getModel(
                 MODEL_NAME_LOCAL_2,
@@ -83,7 +83,7 @@ public void listModels() throws ExecutionException, InterruptedException {
 
     modelSetTask = FirebaseModelDownloader.getInstance().listDownloadedModels();
     Tasks.await(modelSetTask);
-    assertEquals(modelSetTask.getResult().size(), 2);
+    assertEquals(modelSetTask.getResult().size(), 1);
   }
 
   @Test

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java

@@ -54,8 +54,8 @@ public class FirebaseModelDownloader {
   private final CustomModel.Factory modelFactory;
 
   @Inject
-  @RequiresApi(api = VERSION_CODES.KITKAT)
   @VisibleForTesting
+  @RequiresApi(api = VERSION_CODES.KITKAT)
   FirebaseModelDownloader(
       FirebaseOptions firebaseOptions,
       SharedPreferencesUtil sharedPreferencesUtil,

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloaderComponent.java

@@ -63,7 +63,7 @@ interface Builder {
 
   @Module
   interface MainModule {
-    
+
     @Provides
     @Named("persistenceKey")
     static String persistenceKey(FirebaseApp app) {

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadService.java

@@ -14,7 +14,6 @@
 
 package com.google.firebase.ml.modeldownloader.internal;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.text.TextUtils;
@@ -28,6 +27,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
@@ -96,16 +96,14 @@ public class CustomModelDownloadService {
   private String downloadHost = FIREBASE_DOWNLOAD_HOST;
   private final Executor blockingExecutor;
 
-  // TODO(b/258424267): Migrate to go/firebase-android-executors
-  @SuppressLint("ThreadPoolCreation")
   @Inject
   public CustomModelDownloadService(
       Context context,
       FirebaseOptions options,
       Provider<FirebaseInstallationsApi> installationsApi,
       FirebaseMlLogger eventLogger,
       CustomModel.Factory modelFactory,
-      Executor blockingExecutor) {
+      @Blocking Executor blockingExecutor) {
     this.context = context;
     firebaseInstallations = installationsApi;
     apiKey = options.getApiKey();