diff options
author | Jeff Davidson <jpd@google.com> | 2015-04-06 17:08:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 17:08:27 +0000 |
commit | 001035d84dec844eac16037ac512ad9d35023ac9 (patch) | |
tree | c69326ca86ecb487a6b6ee1b7335f04accdbd42d /java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java | |
parent | bd87b5ee4a3a8715784a6e12e97c898eff303e68 (diff) | |
parent | eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482 (diff) | |
download | external_protobuf-001035d84dec844eac16037ac512ad9d35023ac9.zip external_protobuf-001035d84dec844eac16037ac512ad9d35023ac9.tar.gz external_protobuf-001035d84dec844eac16037ac512ad9d35023ac9.tar.bz2 |
am eff5d5b3: am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Parcelable message."
* commit 'eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482':
Generate a CREATOR for each Parcelable message.
Diffstat (limited to 'java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java')
-rw-r--r-- | java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java b/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java index b07f1d6..83f973d 100644 --- a/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java +++ b/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java @@ -40,21 +40,6 @@ import com.google.protobuf.nano.MessageNano; */ public abstract class ParcelableMessageNano extends MessageNano implements Parcelable { - // Used by Parcelable - @SuppressWarnings("unused") - public static final Creator<ParcelableMessageNano> CREATOR = - new Creator<ParcelableMessageNano>() { - @Override - public ParcelableMessageNano createFromParcel(Parcel in) { - return ParcelingUtil.createFromParcel(in); - } - - @Override - public ParcelableMessageNano[] newArray(int size) { - return new ParcelableMessageNano[size]; - } - }; - @Override public int describeContents() { return 0; @@ -62,6 +47,6 @@ public abstract class ParcelableMessageNano extends MessageNano implements Parce @Override public void writeToParcel(Parcel out, int flags) { - ParcelingUtil.writeToParcel(getClass(), this, out); + ParcelableMessageNanoCreator.writeToParcel(getClass(), this, out); } } |