| commit | dfe0227620d6cc72efd56aa29376108e643ef186 | [log] [tgz] |
|---|---|---|
| author | Jake Wharton <jakew@google.com> | Fri Dec 01 16:06:10 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 01 16:06:10 2017 +0000 |
| tree | a3d5a79ef7a20d36809cbde53f3ad6b8f8248fb2 | |
| parent | adb1aecb46c1c9f7160e9e00adb3a02cd6854555 [diff] | |
| parent | 73f1e89d7b93690caf68c7350c56e424e4c73343 [diff] |
Merge "Extend Closable instead of AutoClosable." into oc-mr1-support-27.0-dev
diff --git a/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteProgram.java b/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteProgram.java index 6c2bb72..73c98c6 100644 --- a/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteProgram.java +++ b/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteProgram.java
@@ -60,7 +60,7 @@ } @Override - public void close() throws Exception { + public void close() { mDelegate.close(); } }
diff --git a/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteStatement.java b/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteStatement.java index 53a04bd..ccb5614 100644 --- a/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteStatement.java +++ b/persistence/db-framework/src/main/java/android/arch/persistence/db/framework/FrameworkSQLiteStatement.java
@@ -90,7 +90,7 @@ } @Override - public void close() throws Exception { + public void close() { mDelegate.close(); } }
diff --git a/persistence/db/src/main/java/android/arch/persistence/db/SupportSQLiteProgram.java b/persistence/db/src/main/java/android/arch/persistence/db/SupportSQLiteProgram.java index c6d43cc..38c1ac1 100644 --- a/persistence/db/src/main/java/android/arch/persistence/db/SupportSQLiteProgram.java +++ b/persistence/db/src/main/java/android/arch/persistence/db/SupportSQLiteProgram.java
@@ -16,16 +16,14 @@ package android.arch.persistence.db; -import android.annotation.TargetApi; -import android.os.Build; +import java.io.Closeable; /** * An interface to map the behavior of {@link android.database.sqlite.SQLiteProgram}. */ -@TargetApi(Build.VERSION_CODES.KITKAT) @SuppressWarnings("unused") -public interface SupportSQLiteProgram extends AutoCloseable { +public interface SupportSQLiteProgram extends Closeable { /** * Bind a NULL value to this statement. The value remains bound until * {@link #clearBindings} is called.
diff --git a/room/runtime/src/main/java/android/arch/persistence/room/RoomSQLiteQuery.java b/room/runtime/src/main/java/android/arch/persistence/room/RoomSQLiteQuery.java index a8defd4..a10cc52 100644 --- a/room/runtime/src/main/java/android/arch/persistence/room/RoomSQLiteQuery.java +++ b/room/runtime/src/main/java/android/arch/persistence/room/RoomSQLiteQuery.java
@@ -209,7 +209,7 @@ } @Override - public void close() throws Exception { + public void close() { // no-op. not calling release because it is internal API. }