From 50ec4afe25730e130abb55228fc04a7417a1b1db Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:28 -0700 Subject: [PATCH] Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: If17d2944bfd3e7ab10592a4c74c956203c356f81 --- .../launcher3/QuickstepTransitionManager.java | 2 +- .../taskbar/DesktopTaskbarUIController.java | 2 ++ src/com/android/launcher3/LauncherFiles.java | 13 ++++++++----- src/com/android/launcher3/PagedView.java | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index e1a3b729c1..1539c9fee8 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -1001,7 +1001,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener mAppWindowScale = widgetBackgroundBounds.width() / windowTargetBounds.width(); // Crop scaled app window to match widget appWindowCrop.set(0 /* left */, 0 /* top */, - Math.round(windowTargetBounds.width()) /* right */, + windowTargetBounds.width() /* right */, Math.round(widgetBackgroundBounds.height() / mAppWindowScale) /* bottom */); matrix.setTranslate(widgetBackgroundBounds.left, widgetBackgroundBounds.top); matrix.postScale(mAppWindowScale, mAppWindowScale, widgetBackgroundBounds.left, diff --git a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java index e2359c0d5e..bb55a9b15f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java @@ -30,11 +30,13 @@ public class DesktopTaskbarUIController extends TaskbarUIController { mLauncher = launcher; } + @SuppressWarnings("MissingSuperCall") // TODO: Fix me @Override protected void init(TaskbarControllers taskbarControllers) { mLauncher.getHotseat().setIconsAlpha(0f); } + @SuppressWarnings("MissingSuperCall") // TODO: Fix me @Override protected void onDestroy() { mLauncher.getHotseat().setIconsAlpha(1f); diff --git a/src/com/android/launcher3/LauncherFiles.java b/src/com/android/launcher3/LauncherFiles.java index e59eac8dd2..d730cea804 100644 --- a/src/com/android/launcher3/LauncherFiles.java +++ b/src/com/android/launcher3/LauncherFiles.java @@ -47,9 +47,12 @@ public class LauncherFiles { DEVICE_PREFERENCES_KEY + XML, APP_ICONS_DB)); - public static final List ALL_FILES = Collections.unmodifiableList( - new ArrayList() {{ - addAll(GRID_DB_FILES); - addAll(OTHER_FILES); - }}); + private static List createAllFiles() { + ArrayList result = new ArrayList<>(); + result.addAll(GRID_DB_FILES); + result.addAll(OTHER_FILES); + return Collections.unmodifiableList(result); + } + + public static final List ALL_FILES = createAllFiles(); } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index cba0b7d709..ef363f5334 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1604,7 +1604,7 @@ public abstract class PagedView extends ViewGrou } private int getDisplacementFromScreenCenter(int childIndex, int screenCenter) { - int childSize = Math.round(getChildVisibleSize(childIndex)); + int childSize = getChildVisibleSize(childIndex); int halfChildSize = (childSize / 2); int childCenter = getChildOffset(childIndex) + halfChildSize; return childCenter - screenCenter;