diff options
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/AsyncTask.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/ParcelFileDescriptor.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index f0309d6..9d5d742 100644 --- a/core/java/android/os/AsyncTask.java +++ b/core/java/android/os/AsyncTask.java @@ -281,7 +281,7 @@ public abstract class AsyncTask<Params, Progress, Result> { /** * Runs on the UI thread after {@link #doInBackground}. The * specified result is the value returned by {@link #doInBackground} - * or null if the task was cancelled or an exception occured. + * or null if the task was cancelled or an exception occurred. * * @param result The result of the operation computed by {@link #doInBackground}. * diff --git a/core/java/android/os/ParcelFileDescriptor.java b/core/java/android/os/ParcelFileDescriptor.java index 5f6c4f0..b6c2ed6 100644 --- a/core/java/android/os/ParcelFileDescriptor.java +++ b/core/java/android/os/ParcelFileDescriptor.java @@ -153,6 +153,7 @@ public class ParcelFileDescriptor implements Parcelable { private static native int createPipeNative(FileDescriptor[] outFds); /** + * @deprecated Please use createPipe() or ContentProvider.openPipeHelper(). * Gets a file descriptor for a read-only copy of the given data. * * @param data Data to copy. @@ -161,6 +162,7 @@ public class ParcelFileDescriptor implements Parcelable { * @return A ParcelFileDescriptor. * @throws IOException if there is an error while creating the shared memory area. */ + @Deprecated public static ParcelFileDescriptor fromData(byte[] data, String name) throws IOException { if (data == null) return null; MemoryFile file = new MemoryFile(name, data.length); |