From d49e7ebae2c09cde5a0ed5af488555e4fdd62fd1 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 29 Jan 2019 14:47:13 +0000 Subject: [PATCH] Fix nullness checks (pending stub to fix it properly) PiperOrigin-RevId: 231396213 --- .../android/exoplayer2/database/ExoDatabaseProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java index 9306b22353..ece8e57ae7 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java @@ -22,6 +22,7 @@ import android.database.DatabaseErrorHandler; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import android.support.annotation.Nullable; import com.google.android.exoplayer2.util.Log; import java.io.File; @@ -131,11 +132,12 @@ public final class ExoDatabaseProvider extends SQLiteOpenHelper implements Datab } @Override + @SuppressWarnings("nullness:argument.type.incompatible") public SQLiteDatabase openOrCreateDatabase( String name, int mode, SQLiteDatabase.CursorFactory factory, - DatabaseErrorHandler errorHandler) { + @Nullable DatabaseErrorHandler errorHandler) { File databasePath = getDatabasePath(name); int flags = SQLiteDatabase.CREATE_IF_NECESSARY; if ((mode & MODE_ENABLE_WRITE_AHEAD_LOGGING) != 0) {