提交 32313e35 编写于 作者: S Sam Judd

Fix lint/PMD warnings.

上级 bb5c391a
......@@ -245,6 +245,7 @@ public class LruBitmapPool implements BitmapPool {
return strategy;
}
@TargetApi(Build.VERSION_CODES.O)
private static Set<Bitmap.Config> getDefaultAllowedConfigs() {
Set<Bitmap.Config> configs = new HashSet<>();
configs.addAll(Arrays.asList(Bitmap.Config.values()));
......
......@@ -28,7 +28,8 @@ public final class MemorySizeCalculator {
int getHeightPixels();
}
private MemorySizeCalculator(MemorySizeCalculator.Builder builder) {
// Package private to avoid PMD warning.
MemorySizeCalculator(MemorySizeCalculator.Builder builder) {
this.context = builder.context;
arrayPoolSize =
......@@ -39,10 +40,9 @@ public final class MemorySizeCalculator {
getMaxSize(
builder.activityManager, builder.maxSizeMultiplier, builder.lowMemoryMaxSizeMultiplier);
int screenSize =
builder.screenDimensions.getWidthPixels() *
builder.screenDimensions.getHeightPixels() *
BYTES_PER_ARGB_8888_PIXEL;
int widthPixels = builder.screenDimensions.getWidthPixels();
int heightPixels = builder.screenDimensions.getHeightPixels();
int screenSize = widthPixels * heightPixels * BYTES_PER_ARGB_8888_PIXEL;
int targetBitmapPoolSize = Math.round(screenSize * builder.bitmapPoolScreens);
......
......@@ -515,11 +515,16 @@ public final class Downsampler {
+ ", inBitmap: " + getInBitmapString(options), e);
}
// Avoid short circuiting SDK checks.
@SuppressWarnings("PMD.CollapsibleIfStatements")
@TargetApi(Build.VERSION_CODES.O)
private static void setInBitmap(BitmapFactory.Options options, BitmapPool bitmapPool, int width,
int height) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
&& options.inPreferredConfig == Config.HARDWARE) {
return;
// Avoid short circuiting, it appears to break on some devices.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (options.inPreferredConfig == Config.HARDWARE) {
return;
}
}
// BitmapFactory will clear out the Bitmap before writing to it, so getDirty is safe.
options.inBitmap = bitmapPool.getDirty(width, height, options.inPreferredConfig);
......
package com.bumptech.glide.load.resource.bitmap;
import android.annotation.TargetApi;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Build;
......@@ -76,6 +77,7 @@ final class HardwareConfigState {
// Singleton constructor.
}
@TargetApi(Build.VERSION_CODES.O)
boolean setHardwareConfigIfAllowed(
int targetWidth, int targetHeight, BitmapFactory.Options optionsWithScaling) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册