am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair

Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp

* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
  Fix code example in Parcelable javadoc
This commit is contained in:
Bjorn Bringert
2009-11-09 16:24:46 -08:00
committed by Android Git Automerger

View File

@@ -28,13 +28,17 @@ package android.os;
* <pre>
* public class MyParcelable implements Parcelable {
* private int mData;
*
*
* public int describeContents() {
* return 0;
* }
*
* public void writeToParcel(Parcel out, int flags) {
* out.writeInt(mData);
* }
*
* public static final Parcelable.Creator<MyParcelable> CREATOR
* = new Parcelable.Creator<MyParcelable>() {
* public static final Parcelable.Creator&lt;MyParcelable&gt; CREATOR
* = new Parcelable.Creator&lt;MyParcelable&gt;() {
* public MyParcelable createFromParcel(Parcel in) {
* return new MyParcelable(in);
* }
@@ -42,7 +46,7 @@ package android.os;
* public MyParcelable[] newArray(int size) {
* return new MyParcelable[size];
* }
* }
* };
*
* private MyParcelable(Parcel in) {
* mData = in.readInt();