Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread

Browse Source 
Merge commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a' into gingerbread-plus-aosp

* commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a':
  DropBoxManager.Entry implements Closeable
This commit is contained in:
Brad Fitzpatrick
2010-10-08 13:01:29 -07:00
committed by Android Git Automerger
parent e0c8545a23 a2a1ca42bc
commit b323559b13
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.xml
View File

@@ -127899,6 +127899,8 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<implements name="java.io.Closeable">
</implements>
<implements name="android.os.Parcelable"> <implements name="android.os.Parcelable">
</implements> </implements>
<constructor name="DropBoxManager.Entry" <constructor name="DropBoxManager.Entry"

3
core/java/android/os/DropBoxManager.java
View File

@@ -21,6 +21,7 @@ import android.util.Log;
import com.android.internal.os.IDropBoxManagerService; import com.android.internal.os.IDropBoxManagerService;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.Closeable;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@@ -61,7 +62,7 @@ public class DropBoxManager {
* This may include a reference to a stream, so you must call * This may include a reference to a stream, so you must call
* {@link #close()} when you are done using it. * {@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 String mTag;
private final long mTimeMillis; private final long mTimeMillis;