Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4de91118: am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"

Browse Source 
* commit '4de9111819638b70dd6fb58094d7a61477fc59da':
  Improve Parcel's handling of non-primitive arrays
This commit is contained in:
Paul Duffin
2014-02-12 23:01:39 +00:00
committed by Android Git Automerger
parent 5a42b10baa 4de9111819
commit 5ea06c59be
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/os/Parcel.java
View File

@@ -1247,9 +1247,6 @@ public final class Parcel {
} else if (v instanceof Parcelable[]) { } else if (v instanceof Parcelable[]) {
writeInt(VAL_PARCELABLEARRAY); writeInt(VAL_PARCELABLEARRAY);
writeParcelableArray((Parcelable[]) v, 0); writeParcelableArray((Parcelable[]) v, 0);
} else if (v instanceof Object[]) {
writeInt(VAL_OBJECTARRAY);
writeArray((Object[]) v);
} else if (v instanceof int[]) { } else if (v instanceof int[]) {
writeInt(VAL_INTARRAY); writeInt(VAL_INTARRAY);
writeIntArray((int[]) v); writeIntArray((int[]) v);
@@ -1259,12 +1256,20 @@ public final class Parcel {
} else if (v instanceof Byte) { } else if (v instanceof Byte) {
writeInt(VAL_BYTE); writeInt(VAL_BYTE);
writeInt((Byte) v); writeInt((Byte) v);
} else if (v instanceof Serializable) {
// Must be last
writeInt(VAL_SERIALIZABLE);
writeSerializable((Serializable) v);
} else { } else {
throw new RuntimeException("Parcel: unable to marshal value " + v); Class<?> clazz = v.getClass();
if (clazz.isArray() && clazz.getComponentType() == Object.class) {
// Only pure Object[] are written here, Other arrays of non-primitive types are
// handled by serialization as this does not record the component type.
writeInt(VAL_OBJECTARRAY);
writeArray((Object[]) v);
} else if (v instanceof Serializable) {
// Must be last
writeInt(VAL_SERIALIZABLE);
writeSerializable((Serializable) v);
} else {
throw new RuntimeException("Parcel: unable to marshal value " + v);
}
} }
} }