Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b323559b authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

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

Merge commit 'a2a1ca42' into gingerbread-plus-aosp

* commit 'a2a1ca42':
  DropBoxManager.Entry implements Closeable
parents e0c8545a a2a1ca42

api/current.xml

+2 −0
Original line number Diff line number Diff line
@@ -127899,6 +127899,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<implements name="java.io.Closeable">

</implements>

<implements name="android.os.Parcelable">

</implements>

<constructor name="DropBoxManager.Entry"

core/java/android/os/DropBoxManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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;