commit 8435cf0d8b9e24715d5b310ed569fda918dcaa46
author Narayan Kamath <narayan@google.com> Fri Jan 24 14:59:06 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 24 14:59:06 2014 +0000
tree 64e6d50df6af2b3c2959fd24d9d40aee137c960a
parent 01664b3709451d287f30a68fcb8f599e8dc484a5
parent b34a4615f82a4ad8ce2c0687f47e2113e057e893

Merge "Hide android.os.Parcel.obtain(int)."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7fd648e..2889e62 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18706,7 +18706,6 @@
     method public final boolean hasFileDescriptors();
     method public final byte[] marshall();
     method public static android.os.Parcel obtain();
-    method protected static final android.os.Parcel obtain(int);
     method public final java.lang.Object[] readArray(java.lang.ClassLoader);
     method public final java.util.ArrayList readArrayList(java.lang.ClassLoader);
     method public final void readBinderArray(android.os.IBinder[]);

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index b132627..0ee1109 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -2246,6 +2246,7 @@
     private static final HashMap<ClassLoader,HashMap<String,Parcelable.Creator>>
         mCreators = new HashMap<ClassLoader,HashMap<String,Parcelable.Creator>>();
 
+    /** @hide for internal use only. */
     static protected final Parcel obtain(int obj) {
         final Parcel[] pool = sHolderPool;
         synchronized (pool) {