Internal change

PiperOrigin-RevId: 499533290

library/src/main/java/com/bumptech/glide/Glide.java

@@ -137,21 +137,18 @@ public static Glide get(@NonNull Context context) {
   }
 
   @GuardedBy("Glide.class")
-  @VisibleForTesting
-  static void checkAndInitializeGlide(
+  private static void checkAndInitializeGlide(
       @NonNull Context context, @Nullable GeneratedAppGlideModule generatedAppGlideModule) {
     // In the thread running initGlide(), one or more classes may call Glide.get(context).
     // Without this check, those calls could trigger infinite recursion.
     if (isInitializing) {
       throw new IllegalStateException(
-          "Glide has been called recursively, this is probably an internal library error!");
+          "You cannot call Glide.get() in registerComponents(),"
+              + " use the provided Glide instance instead");
     }
     isInitializing = true;
-    try {
-      initializeGlide(context, generatedAppGlideModule);
-    } finally {
-      isInitializing = false;
-    }
+    initializeGlide(context, generatedAppGlideModule);
+    isInitializing = false;
   }
 
   /**

library/src/main/java/com/bumptech/glide/RegistryFactory.java

@@ -90,24 +90,22 @@ static GlideSupplier<Registry> lazilyCreateAndInitializeRegistry(
       final List<GlideModule> manifestModules,
       @Nullable final AppGlideModule annotationGeneratedModule) {
     return new GlideSupplier<Registry>() {
-      // Rely on callers using memoization if they want to avoid duplicate work, but
-      // rely on ourselves to verify that no recursive initialization occurs.
-      private boolean isInitializing;
+      private boolean isInitializingOrInitialized;
 
       @Override
       public Registry get() {
-        if (isInitializing) {
+        if (isInitializingOrInitialized) {
           throw new IllegalStateException(
               "Recursive Registry initialization! In your"
                   + " AppGlideModule and LibraryGlideModules, Make sure you're using the provided "
                   + "Registry rather calling glide.getRegistry()!");
         }
+        isInitializingOrInitialized = true;
+
         Trace.beginSection("Glide registry");
-        isInitializing = true;
         try {
           return createAndInitRegistry(glide, manifestModules, annotationGeneratedModule);
         } finally {
-          isInitializing = false;
           Trace.endSection();
         }
       }