diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-08 12:59:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-08 12:59:30 -0700 |
| commit | a2a1ca42bc07af77a8a10b714517d006cb66c36a (patch) | |
| tree | dd9692f02d68e7d9f42ef4c699fa9d77e050f915 | |
| parent | 0fd4e216e7d6045528d5d1010f8b5f01581efb10 (diff) | |
| parent | cc792c4149b7e768fd894c9b268d815a90a60bd0 (diff) | |
| download | frameworks_base-a2a1ca42bc07af77a8a10b714517d006cb66c36a.zip frameworks_base-a2a1ca42bc07af77a8a10b714517d006cb66c36a.tar.gz frameworks_base-a2a1ca42bc07af77a8a10b714517d006cb66c36a.tar.bz2 | |
Merge "DropBoxManager.Entry implements Closeable" into gingerbread
| -rw-r--r-- | api/current.xml | 2 | ||||
| -rw-r--r-- | core/java/android/os/DropBoxManager.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index b657c34..a2bce1d 100644 --- a/api/current.xml +++ b/api/current.xml @@ -125837,6 +125837,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="java.io.Closeable"> +</implements> <implements name="android.os.Parcelable"> </implements> <constructor name="DropBoxManager.Entry" diff --git a/core/java/android/os/DropBoxManager.java b/core/java/android/os/DropBoxManager.java index fa23458..a47c66a 100644 --- a/core/java/android/os/DropBoxManager.java +++ b/core/java/android/os/DropBoxManager.java @@ -21,6 +21,7 @@ import android.util.Log; import com.android.internal.os.IDropBoxManagerService; import java.io.ByteArrayInputStream; +import java.io.Closeable; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -61,7 +62,7 @@ public class DropBoxManager { * This may include a reference to a stream, so you must call * {@link #close()} when you are done using it. */ - public static class Entry implements Parcelable { + public static class Entry implements Parcelable, Closeable { private final String mTag; private final long mTimeMillis; |