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

Merge "Revert "Revert "Write UsageEvents Parcel data as a Blob""" into pi-dev

Browse Source 
am: 14c61286c4

Change-Id: If4e6d7fbf0d6799ce88ec33b37fb8cef7e290f1e
This commit is contained in:
Michael Wachenschwanz
2018-05-24 14:26:40 -07:00
committed by android-build-merger
parent 64ac4ee699 14c61286c4
commit 3ba689851c
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/android/app/usage/UsageEvents.java
View File

@@ -399,16 +399,20 @@ public final class UsageEvents implements Parcelable {
* {@hide} * {@hide}
*/ */
public UsageEvents(Parcel in) { public UsageEvents(Parcel in) {
mEventCount = in.readInt(); byte[] bytes = in.readBlob();
mIndex = in.readInt(); Parcel data = Parcel.obtain();
data.unmarshall(bytes, 0, bytes.length);
data.setDataPosition(0);
mEventCount = data.readInt();
mIndex = data.readInt();
if (mEventCount > 0) { if (mEventCount > 0) {
mStringPool = in.createStringArray(); mStringPool = data.createStringArray();
final int listByteLength = in.readInt(); final int listByteLength = data.readInt();
final int positionInParcel = in.readInt(); final int positionInParcel = data.readInt();
mParcel = Parcel.obtain(); mParcel = Parcel.obtain();
mParcel.setDataPosition(0); mParcel.setDataPosition(0);
mParcel.appendFrom(in, in.dataPosition(), listByteLength); mParcel.appendFrom(data, data.dataPosition(), listByteLength);
mParcel.setDataSize(mParcel.dataPosition()); mParcel.setDataSize(mParcel.dataPosition());
mParcel.setDataPosition(positionInParcel); mParcel.setDataPosition(positionInParcel);
} }
@@ -586,10 +590,11 @@ public final class UsageEvents implements Parcelable {
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mEventCount); Parcel data = Parcel.obtain();
dest.writeInt(mIndex); data.writeInt(mEventCount);
data.writeInt(mIndex);
if (mEventCount > 0) { if (mEventCount > 0) {
dest.writeStringArray(mStringPool); data.writeStringArray(mStringPool);
if (mEventsToWrite != null) { if (mEventsToWrite != null) {
// Write out the events // Write out the events
@@ -604,31 +609,34 @@ public final class UsageEvents implements Parcelable {
final int listByteLength = p.dataPosition(); final int listByteLength = p.dataPosition();
// Write the total length of the data. // Write the total length of the data.
dest.writeInt(listByteLength); data.writeInt(listByteLength);
// Write our current position into the data. // Write our current position into the data.
dest.writeInt(0); data.writeInt(0);
// Write the data. // Write the data.
dest.appendFrom(p, 0, listByteLength); data.appendFrom(p, 0, listByteLength);
} finally { } finally {
p.recycle(); p.recycle();
} }
} else if (mParcel != null) { } else if (mParcel != null) {
// Write the total length of the data. // Write the total length of the data.
dest.writeInt(mParcel.dataSize()); data.writeInt(mParcel.dataSize());
// Write out current position into the data. // Write out current position into the data.
dest.writeInt(mParcel.dataPosition()); data.writeInt(mParcel.dataPosition());
// Write the data. // Write the data.
dest.appendFrom(mParcel, 0, mParcel.dataSize()); data.appendFrom(mParcel, 0, mParcel.dataSize());
} else { } else {
throw new IllegalStateException( throw new IllegalStateException(
"Either mParcel or mEventsToWrite must not be null"); "Either mParcel or mEventsToWrite must not be null");
} }
} }
// Data can be too large for a transact. Write the data as a Blob, which will be written to
// ashmem if too large.
dest.writeBlob(data.marshall());
} }
public static final Creator<UsageEvents> CREATOR = new Creator<UsageEvents>() { public static final Creator<UsageEvents> CREATOR = new Creator<UsageEvents>() {