From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 9 Jun 2017 14:16:05 +0000 Subject: Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b --- java/com/android/dialer/protos/ProtoParsers.java | 125 ++++++++++++++++++++--- 1 file changed, 112 insertions(+), 13 deletions(-) (limited to 'java/com/android/dialer/protos/ProtoParsers.java') diff --git a/java/com/android/dialer/protos/ProtoParsers.java b/java/com/android/dialer/protos/ProtoParsers.java index 5a60799bc..b77c0699b 100644 --- a/java/com/android/dialer/protos/ProtoParsers.java +++ b/java/com/android/dialer/protos/ProtoParsers.java @@ -18,10 +18,13 @@ package com.android.dialer.protos; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; import com.android.dialer.common.Assert; +import com.google.protobuf.CodedOutputStream; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.MessageLite; +import java.io.IOException; /** Useful methods for using Protocol Buffers with Android. */ public final class ProtoParsers { @@ -32,8 +35,11 @@ public final class ProtoParsers { @SuppressWarnings("unchecked") // We want to eventually optimize away parser classes, so cast public static T get(Bundle bundle, String key, T defaultInstance) throws InvalidProtocolBufferException { - byte[] bytes = bundle.getByteArray(key); - return (T) mergeFrom(bytes, defaultInstance.getDefaultInstanceForType()); + // Class loaders are unique to each Class instance, so we need to specify how to decode + // the information again, even though we set the class loaders when serializing the data. + bundle.setClassLoader(ProtoParsers.class.getClassLoader()); + InternalDontUse parcelable = bundle.getParcelable(key); + return (T) parcelable.getMessageUnsafe(defaultInstance.getDefaultInstanceForType()); } /** @@ -45,7 +51,7 @@ public final class ProtoParsers { try { return get(bundle, key, defaultInstance); } catch (InvalidProtocolBufferException e) { - throw Assert.createIllegalStateFailException(e.toString()); + throw new RuntimeException(e); } } @@ -62,28 +68,121 @@ public final class ProtoParsers { * Stores a proto in a Bundle, for later retrieval by {@link #get(Bundle, String, MessageLite)} or * {@link #getFromInstanceState(Bundle, String, MessageLite)}. */ - public static void put( - @NonNull Bundle bundle, @NonNull String key, @NonNull MessageLite message) { - Assert.checkState(message != null); - bundle.putByteArray(key, message.toByteArray()); + public static void put(Bundle bundle, String key, MessageLite message) { + bundle.putParcelable(key, new InternalDontUse<>(null, message)); } /** * Stores a proto in an Intent, for later retrieval by {@link #get(Bundle, String, MessageLite)}. * Needs separate method because Intent has similar to but different API than Bundle. */ - public static void put(@NonNull Intent intent, @NonNull String key, MessageLite message) { - Assert.checkState(message != null); - intent.putExtra(key, message.toByteArray()); + public static void put(Intent intent, String key, MessageLite message) { + intent.putExtra(key, new InternalDontUse<>(null, message)); + } + + /** Returns a {@linkplain Parcelable} representation of this protobuf message. */ + public static ParcelableProto asParcelable(T message) { + return new InternalDontUse<>(null, message); + } + + /** + * A protobuf message that can be stored in a {@link Parcel}. + * + *

Note: This Parcelable can only be used in single app. Attempting to send + * it to another app through an Intent will result in an exception due to Proguard + * obfusation when the target application attempts to load the ParcelableProto class. + */ + public interface ParcelableProto extends Parcelable { + /** + * @throws IllegalStateException if the parceled data does not correspond to the defaultInstance + * type. + */ + T getMessage(T defaultInstance); + } + + /** Public because of Parcelable requirements. Do not use. */ + public static final class InternalDontUse implements ParcelableProto { + /* One of these two fields is always populated - since the bytes field never escapes this + * object, there is no risk of concurrent modification by multiple threads, and volatile + * is sufficient to be thread-safe. */ + private volatile byte[] bytes; + private volatile T message; + + /** + * Ideally, we would have type safety here. However, a static field {@link Creator} is required + * by {@link Parcelable}. Static fields are inherently not type safe, since only 1 exists per + * class (rather than 1 per type). + */ + public static final Parcelable.Creator> CREATOR = + new Creator>() { + @Override + public InternalDontUse createFromParcel(Parcel parcel) { + int serializedSize = parcel.readInt(); + byte[] array = new byte[serializedSize]; + parcel.readByteArray(array); + return new InternalDontUse<>(array, null); + } + + @Override + public InternalDontUse[] newArray(int i) { + return new InternalDontUse[i]; + } + }; + + private InternalDontUse(byte[] bytes, T message) { + Assert.checkArgument(bytes != null || message != null, "Must have a message or bytes"); + this.bytes = bytes; + this.message = message; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel parcel, int i) { + if (bytes == null) { + final byte[] flatArray = new byte[message.getSerializedSize()]; + try { + message.writeTo(CodedOutputStream.newInstance(flatArray)); + bytes = flatArray; + } catch (IOException impossible) { + throw new AssertionError(impossible); + } + } + parcel.writeInt(bytes.length); + parcel.writeByteArray(bytes); + } + + @Override + public T getMessage(T defaultInstance) { + try { + // The proto should never be invalid if it came from our application, so if it is, throw. + return getMessageUnsafe(defaultInstance); + } catch (InvalidProtocolBufferException e) { + throw new IllegalStateException(e); + } + } + + @SuppressWarnings("unchecked") // We're being deserialized, so there's no real type safety + T getMessageUnsafe(T defaultInstance) throws InvalidProtocolBufferException { + // There's a risk that we'll double-parse the bytes, but that's OK, because it'll end up + // as the same immutable object anyway. + if (message == null) { + message = (T) defaultInstance.toBuilder().mergeFrom(bytes).build(); + } + return message; + } } /** Parses a proto, throwing parser errors as runtime exceptions. */ @SuppressWarnings("unchecked") // We want to eventually optimize away parser classes - private static T mergeFrom(byte[] bytes, T defaultInstance) { + public static T mergeFrom(byte[] bytes, T defaultInstance) { try { return (T) defaultInstance.toBuilder().mergeFrom(bytes).build(); } catch (InvalidProtocolBufferException e) { - throw Assert.createIllegalStateFailException(e.toString()); + throw new RuntimeException(e); } } } -- cgit v1.2.3