diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
index 3d2c043a91..e2fe095d03 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
@@ -17,17 +17,15 @@ package com.google.android.exoplayer2.util;
 
 import android.util.Pair;
 
-/**
- * Converts exceptions into error codes and user readable error messages.
- */
-public interface ErrorMessageProvider<T extends Exception> {
+/** Converts throwables into error codes and user readable error messages. */
+public interface ErrorMessageProvider<T extends Throwable> {
 
   /**
    * Returns a pair consisting of an error code and a user readable error message for the given
-   * exception.
+   * throwable.
    *
-   * @param exception The exception for which an error code and message should be generated.
+   * @param throwable The throwable for which an error code and message should be generated.
+   * @return A pair consisting of an error code and a user readable error message.
    */
-  Pair<Integer, String> getErrorMessage(T exception);
-
+  Pair<Integer, String> getErrorMessage(T throwable);
 }
diff --git a/testutils/build.gradle b/testutils/build.gradle
index ddf0cdf860..7c4b163713 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -24,9 +24,9 @@ android {
     }
 
     lintOptions {
-        // Truth depends on JUnit, which depends on java.lang.management, which is not part of
-        // Android. Remove this when JUnit 4.13 or later is used. See:
-        // https://github.com/junit-team/junit4/pull/1187.
+        // Truth depends on JUnit, which depends on java.lang.management, which
+        // is not part of Android. Remove this when JUnit 4.13 or later is used.
+        // See: https://github.com/junit-team/junit4/pull/1187.
         disable 'InvalidPackage'
     }
 }