Finalize Glide hardware Bitmap dimension/count limits for P+.

PiperOrigin-RevId: 277184075
bumptech · Oct 29, 2019 · e8c841c · e8c841c
1 parent b5a0ed6
commit e8c841c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 36 deletions.
diff --git a/library/src/main/java/com/bumptech/glide/Glide.java b/library/src/main/java/com/bumptech/glide/Glide.java
@@ -360,9 +360,7 @@ private static void throwIncorrectGlideModule(Exception e) {
       @NonNull Map<Class<?>, TransitionOptions<?, ?>> defaultTransitionOptions,
       @NonNull List<RequestListener<Object>> defaultRequestListeners,
       boolean isLoggingRequestOriginsEnabled,
-      boolean isImageDecoderEnabledForBitmaps,
-      int hardwareBitmapFdLimit,
-      int minHardwareDimension) {
+      boolean isImageDecoderEnabledForBitmaps) {
     this.engine = engine;
     this.bitmapPool = bitmapPool;
     this.arrayPool = arrayPool;

diff --git a/library/src/main/java/com/bumptech/glide/GlideBuilder.java b/library/src/main/java/com/bumptech/glide/GlideBuilder.java
@@ -22,7 +22,6 @@
 import com.bumptech.glide.load.engine.cache.MemoryCache;
 import com.bumptech.glide.load.engine.cache.MemorySizeCalculator;
 import com.bumptech.glide.load.engine.executor.GlideExecutor;
-import com.bumptech.glide.load.resource.bitmap.HardwareConfigState;
 import com.bumptech.glide.manager.ConnectivityMonitorFactory;
 import com.bumptech.glide.manager.DefaultConnectivityMonitorFactory;
 import com.bumptech.glide.manager.RequestManagerRetriever;
@@ -67,9 +66,6 @@ public RequestOptions build() {
 
   private boolean isImageDecoderEnabledForBitmaps;
 
-  private int hardwareBitmapFdLimit = HardwareConfigState.DEFAULT_MAXIMUM_FDS_FOR_HARDWARE_CONFIGS;
-  private int minHardwareDimension = HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION;
-
   /**
    * Sets the {@link com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool} implementation to use
    * to store and retrieve reused {@link android.graphics.Bitmap}s.
@@ -578,8 +574,6 @@ Glide build(@NonNull Context context) {
         defaultTransitionOptions,
         defaultRequestListeners,
         isLoggingRequestOriginsEnabled,
-        isImageDecoderEnabledForBitmaps,
-        hardwareBitmapFdLimit,
-        minHardwareDimension);
+        isImageDecoderEnabledForBitmaps);
   }
 }
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/HardwareConfigState.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/HardwareConfigState.java
@@ -23,7 +23,9 @@ public final class HardwareConfigState {
    *
    * @see #FD_SIZE_LIST
    */
-  public static final int DEFAULT_MIN_HARDWARE_DIMENSION = 128;
+  @VisibleForTesting static final int MIN_HARDWARE_DIMENSION_O = 128;
+
+  private static final int MIN_HARDWARE_DIMENSION_P = 0;
 
   /**
    * Allows us to check to make sure we're not exceeding the FD limit for a process with hardware
@@ -55,14 +57,15 @@ public final class HardwareConfigState {
    *
    * <p>Access to this variable will be removed in a future version without deprecation.
    */
-  public static final int DEFAULT_MAXIMUM_FDS_FOR_HARDWARE_CONFIGS = 700;
-
-  private static volatile int fdSizeLimit = DEFAULT_MAXIMUM_FDS_FOR_HARDWARE_CONFIGS;
-  private static volatile int minHardwareDimension = DEFAULT_MIN_HARDWARE_DIMENSION;
+  private static final int MAXIMUM_FDS_FOR_HARDWARE_CONFIGS_O = 700;
+  // 20k.
+  private static final int MAXIMUM_FDS_FOR_HARDWARE_CONFIGS_P = 20000;
 
   private static volatile HardwareConfigState instance;
 
   private final boolean isHardwareConfigAllowedByDeviceModel;
+  private final int fdCountLimit;
+  private final int minHardwareDimension;
 
   @GuardedBy("this")
   private int decodesSinceLastFdCheck;
@@ -84,7 +87,13 @@ public static HardwareConfigState getInstance() {
   @VisibleForTesting
   HardwareConfigState() {
     isHardwareConfigAllowedByDeviceModel = isHardwareConfigAllowedByDeviceModel();
-    // Singleton constructor.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      fdCountLimit = MAXIMUM_FDS_FOR_HARDWARE_CONFIGS_P;
+      minHardwareDimension = MIN_HARDWARE_DIMENSION_P;
+    } else {
+      fdCountLimit = MAXIMUM_FDS_FOR_HARDWARE_CONFIGS_O;
+      minHardwareDimension = MIN_HARDWARE_DIMENSION_O;
+    }
   }
 
   public boolean isHardwareConfigAllowed(
@@ -151,7 +160,7 @@ private synchronized boolean isFdSizeBelowHardwareLimit() {
     if (++decodesSinceLastFdCheck >= MINIMUM_DECODES_BETWEEN_FD_CHECKS) {
       decodesSinceLastFdCheck = 0;
       int currentFds = FD_SIZE_LIST.list().length;
-      isFdSizeBelowHardwareLimit = currentFds < fdSizeLimit;
+      isFdSizeBelowHardwareLimit = currentFds < fdCountLimit;
 
       if (!isFdSizeBelowHardwareLimit && Log.isLoggable(Downsampler.TAG, Log.WARN)) {
         Log.w(
@@ -160,7 +169,7 @@ private synchronized boolean isFdSizeBelowHardwareLimit() {
                 + ", file descriptors "
                 + currentFds
                 + ", limit "
-                + fdSizeLimit);
+                + fdCountLimit);
       }
     }
 

diff --git a/...y/test/src/test/java/com/bumptech/glide/load/resource/bitmap/HardwareConfigStateTest.java b/...y/test/src/test/java/com/bumptech/glide/load/resource/bitmap/HardwareConfigStateTest.java
@@ -24,8 +24,8 @@ public class HardwareConfigStateTest {
     BitmapFactory.Options options = new BitmapFactory.Options();
     boolean result =
         state.setHardwareConfigIfAllowed(
-            /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-            /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+            /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+            /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
             options,
             /*isHardwareConfigAllowed=*/ true,
             /*isExifOrientationRequired=*/ false);
@@ -45,8 +45,8 @@ public void setHardwareConfigIfAllowed_withSmallerThanMinWidth_returnsFalse_does
 
     boolean result =
         state.setHardwareConfigIfAllowed(
-            /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION - 1,
-            /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+            /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O - 1,
+            /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
             options,
             /*isHardwareConfigAllowed=*/ true,
             /*isExifOrientationRequired=*/ false);
@@ -66,8 +66,8 @@ public void setHardwareConfigIfAllowed_withSmallerThanMinHeight_returnsFalse_doe
 
     boolean result =
         state.setHardwareConfigIfAllowed(
-            /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-            /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION - 1,
+            /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+            /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O - 1,
             options,
             /*isHardwareConfigAllowed=*/ true,
             /*isExifOrientationRequired=*/ false);
@@ -88,8 +88,8 @@ public void setHardwareConfigIfAllowed_withSmallerThanMinHeight_returnsFalse_doe
 
     boolean result =
         state.setHardwareConfigIfAllowed(
-            /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-            /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+            /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+            /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
             options,
             /*isHardwareConfigAllowed=*/ false,
             /*isExifOrientationRequired=*/ false);
@@ -110,8 +110,8 @@ public void setHardwareConfigIfAllowed_withSmallerThanMinHeight_returnsFalse_doe
 
     boolean result =
         state.setHardwareConfigIfAllowed(
-            /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-            /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+            /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+            /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
             options,
             /*isHardwareConfigAllowed=*/ true,
             /*isExifOrientationRequired=*/ true);
@@ -131,8 +131,8 @@ public void setHardwareConfigIfAllowed_withOsLessThanO_returnsFalse_doesNotSetVa
 
     boolean result =
         state.setHardwareConfigIfAllowed(
-            /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-            /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+            /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+            /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
             options,
             /*isHardwareConfigAllowed=*/ true,
             /*isExifOrientationRequired=*/ false);
@@ -158,8 +158,8 @@ public void setHardwareConfigIfAllowed_withOsLessThanO_returnsFalse_doesNotSetVa
 
       boolean result =
           state.setHardwareConfigIfAllowed(
-              /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-              /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+              /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+              /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
               options,
               /*isHardwareConfigAllowed=*/ true,
               /*isExifOrientationRequired=*/ false);
@@ -185,8 +185,8 @@ public void setHardwareConfigIfAllowed_withDisallowedSamsungDevices_OMR1_returns
 
       boolean result =
           state.setHardwareConfigIfAllowed(
-              /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-              /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+              /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+              /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
               options,
               /*isHardwareConfigAllowed=*/ true,
               /*isExifOrientationRequired=*/ false);
@@ -212,8 +212,8 @@ public void setHardwareConfigIfAllowed_withShortEmptyOrNullModelNames_returnsTru
 
       boolean result =
           state.setHardwareConfigIfAllowed(
-              /*targetWidth=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
-              /*targetHeight=*/ HardwareConfigState.DEFAULT_MIN_HARDWARE_DIMENSION,
+              /*targetWidth=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
+              /*targetHeight=*/ HardwareConfigState.MIN_HARDWARE_DIMENSION_O,
               options,
               /*isHardwareConfigAllowed=*/ true,
               /*isExifOrientationRequired=*/ false);