Correct issues flagged by new errorprone checks
- Removes some nullness annotations from primitive and void types
- Removes a nullness annotation from a function that had both @Nullable and @NonNull
- Suppresses UnusedVariable warnings on some unused function parameters
- Uses the previously unused parameters of one function where it was clear how they should be used
Bug: 361331415
Test: ./gradlew runErrorProne
Change-Id: I6924c329e51a1a01a345c4918246f8f125e79299
diff --git a/browser/browser/src/main/java/androidx/browser/customtabs/PrefetchOptions.java b/browser/browser/src/main/java/androidx/browser/customtabs/PrefetchOptions.java
index a7699dc..fde9b6f 100644
--- a/browser/browser/src/main/java/androidx/browser/customtabs/PrefetchOptions.java
+++ b/browser/browser/src/main/java/androidx/browser/customtabs/PrefetchOptions.java
@@ -41,7 +41,7 @@
@SuppressWarnings("WeakerAccess") /* synthetic access */
PrefetchOptions(
- @NonNull boolean requiresAnonymousIpWhenCrossOrigin, @Nullable Uri sourceOrigin) {
+ boolean requiresAnonymousIpWhenCrossOrigin, @Nullable Uri sourceOrigin) {
this.requiresAnonymousIpWhenCrossOrigin = requiresAnonymousIpWhenCrossOrigin;
this.sourceOrigin = sourceOrigin;
}
diff --git a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java
index 16d4260..c35e89e 100644
--- a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java
+++ b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java
@@ -105,7 +105,6 @@
}
@Override
- @NonNull
public boolean isCaptureProcessProgressAvailable() {
throw new RuntimeException("Stub, replace with implementation.");
}
diff --git a/constraintlayout/constraintlayout-core/src/main/java/androidx/constraintlayout/core/motion/utils/ArcCurveFit.java b/constraintlayout/constraintlayout-core/src/main/java/androidx/constraintlayout/core/motion/utils/ArcCurveFit.java
index 7df5ef9..69e03f2 100644
--- a/constraintlayout/constraintlayout-core/src/main/java/androidx/constraintlayout/core/motion/utils/ArcCurveFit.java
+++ b/constraintlayout/constraintlayout-core/src/main/java/androidx/constraintlayout/core/motion/utils/ArcCurveFit.java
@@ -399,10 +399,12 @@
return mY1 + t * (mY2 - mY1);
}
+ @SuppressWarnings("UnusedVariable")
public double getLinearDX(double t) {
return mEllipseCenterX;
}
+ @SuppressWarnings("UnusedVariable")
public double getLinearDY(double t) {
return mEllipseCenterY;
}
diff --git a/input/input-motionprediction/src/main/java/androidx/input/motionprediction/kalman/BatchedMotionEvent.java b/input/input-motionprediction/src/main/java/androidx/input/motionprediction/kalman/BatchedMotionEvent.java
index 9595006..9639efb 100644
--- a/input/input-motionprediction/src/main/java/androidx/input/motionprediction/kalman/BatchedMotionEvent.java
+++ b/input/input-motionprediction/src/main/java/androidx/input/motionprediction/kalman/BatchedMotionEvent.java
@@ -71,7 +71,7 @@
return mMotionEvent;
}
- public @NonNull int getPointerCount() {
+ public int getPointerCount() {
return mPointerCount;
}
diff --git a/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/AccessibilityPageWrapper.java b/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/AccessibilityPageWrapper.java
index 83247d4..0dc9a7d 100644
--- a/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/AccessibilityPageWrapper.java
+++ b/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/AccessibilityPageWrapper.java
@@ -84,7 +84,6 @@
mPageLinksView.setPageUrlLinks(links);
}
- @NonNull
@Override
public void setPageGotoLinks(@Nullable List<GotoLink> links) {
mPageView.setPageGotoLinks(links);
diff --git a/slice/slice-core/api/restricted_current.txt b/slice/slice-core/api/restricted_current.txt
index bbe0f72..45a6740 100644
--- a/slice/slice-core/api/restricted_current.txt
+++ b/slice/slice-core/api/restricted_current.txt
@@ -243,7 +243,7 @@
method @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static int parseImageMode(androidx.slice.SliceItem);
method @Deprecated public void setActivity(boolean);
method @Deprecated public androidx.slice.core.SliceActionImpl setChecked(boolean);
- method @Deprecated public androidx.slice.core.SliceAction? setContentDescription(CharSequence);
+ method @Deprecated public androidx.slice.core.SliceAction setContentDescription(CharSequence);
method @Deprecated public androidx.slice.core.SliceActionImpl setKey(String);
method @Deprecated public androidx.slice.core.SliceActionImpl setPriority(@IntRange(from=0) int);
}
diff --git a/slice/slice-core/src/main/java/androidx/slice/core/SliceActionImpl.java b/slice/slice-core/src/main/java/androidx/slice/core/SliceActionImpl.java
index 42ae49f..92d1c47 100644
--- a/slice/slice-core/src/main/java/androidx/slice/core/SliceActionImpl.java
+++ b/slice/slice-core/src/main/java/androidx/slice/core/SliceActionImpl.java
@@ -263,7 +263,6 @@
* @param description the content description for this action.
* @return
*/
- @Nullable
@Override
public @NonNull SliceAction setContentDescription(@NonNull CharSequence description) {
mContentDescription = description;
diff --git a/slice/slice-test/src/main/java/androidx/slice/test/SampleSliceProvider.java b/slice/slice-test/src/main/java/androidx/slice/test/SampleSliceProvider.java
index 379b763..150979e 100644
--- a/slice/slice-test/src/main/java/androidx/slice/test/SampleSliceProvider.java
+++ b/slice/slice-test/src/main/java/androidx/slice/test/SampleSliceProvider.java
@@ -1680,7 +1680,7 @@
private SetHostExtraApi21Impl() {}
static void setHostExtra(ListBuilder listBuilder, String key, String value) {
PersistableBundle extras = new PersistableBundle();
- extras.putString("tts", "hello world");
+ extras.putString(key, value);
// Attach additional information for host. Depending on the host apps, this
// information might or might not be used.
// In this case, SliceBrowser is customized to play TTS when binding the slice.
diff --git a/slice/slice-view/src/main/java/androidx/slice/SliceMetadata.java b/slice/slice-view/src/main/java/androidx/slice/SliceMetadata.java
index e05be8d..4287f34 100644
--- a/slice/slice-view/src/main/java/androidx/slice/SliceMetadata.java
+++ b/slice/slice-view/src/main/java/androidx/slice/SliceMetadata.java
@@ -354,7 +354,6 @@
*
* @return the current value of a progress bar or input range associated with this slice.
*/
- @NonNull
public int getRangeValue() {
if (mTemplateType == ROW_TYPE_SLIDER
|| mTemplateType == ROW_TYPE_PROGRESS) {
diff --git a/wear/wear/src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java b/wear/wear/src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java
index bded2fb..cb595c4 100644
--- a/wear/wear/src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java
+++ b/wear/wear/src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java
@@ -401,6 +401,7 @@
}
};
+ @SuppressWarnings("UnusedVariable")
ActionListAdapter(Menu menu) {
mActionMenu = getMenu();
}
