From bae6b59812ac972c9792605d521d6ada069288b2 Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Thu, 2 Apr 2015 14:46:35 -0700
Subject: Generate a CREATOR for each Parcelable message.

This is less ideal from a dex count perspective because it requires a
new variable for each message, and because most apps have proguard
rules that will ensure that CREATOR classes are retained.

However, it is required to be able to use nano protos inside of AIDL
files, as the autogenerated AIDL code fails to compile otherwise. This
is a substantial benefit as it allows for backwards-compatible
parameters and return types in AIDL methods along the lines of
safeparcel.

Bug: 19084705
Change-Id: I66a2c0424b96cf8ff6b631b186cc4f9407dfc1f4
---
 .../nano/android/ParcelableExtendableMessageNano.java   | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'java/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java')

diff --git a/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java b/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
index f3b82ed..739ff18 100644
--- a/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
+++ b/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
@@ -42,21 +42,6 @@ import com.google.protobuf.nano.ExtendableMessageNano;
 public abstract class ParcelableExtendableMessageNano<M extends ExtendableMessageNano<M>>
         extends ExtendableMessageNano<M> implements Parcelable {
 
-    // Used by Parcelable
-    @SuppressWarnings({"unused"})
-    public static final Creator<ParcelableExtendableMessageNano<?>> CREATOR =
-            new Creator<ParcelableExtendableMessageNano<?>>() {
-        @Override
-        public ParcelableExtendableMessageNano<?> createFromParcel(Parcel in) {
-            return ParcelingUtil.createFromParcel(in);
-        }
-
-        @Override
-        public ParcelableExtendableMessageNano<?>[] newArray(int size) {
-            return new ParcelableExtendableMessageNano<?>[size];
-        }
-    };
-
     @Override
     public int describeContents() {
         return 0;
@@ -64,6 +49,6 @@ public abstract class ParcelableExtendableMessageNano<M extends ExtendableMessag
 
     @Override
     public void writeToParcel(Parcel out, int flags) {
-        ParcelingUtil.writeToParcel(getClass(), this, out);
+        ParcelableMessageNanoCreator.writeToParcel(getClass(), this, out);
     }
 }
-- 
cgit v1.1