diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 23:01:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 23:01:57 +0000 |
| commit | 874930a65db1aa30aaead79a6727b65af20c9af2 (patch) | |
| tree | 95d3222d256f093e49666a24602fd4aed6caf650 /core/java/android | |
| parent | 124ec9325e81066e1708b2ba76610ec420b9c32f (diff) | |
| parent | 62dfd982347d08d0884f1439399802ff37c8ba18 (diff) | |
Merge changes I2159bf13,I93146faa am: baa778df4d am: 62dfd98234
Change-Id: Ifac52f18ce8e2bfa78b91d35d776a91324e44d44
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/StatsEvent.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/util/StatsEvent.java b/core/java/android/util/StatsEvent.java index cc32847834c0..7e7164042781 100644 --- a/core/java/android/util/StatsEvent.java +++ b/core/java/android/util/StatsEvent.java @@ -175,7 +175,7 @@ public final class StatsEvent { * @hide **/ @VisibleForTesting - public static final int ERROR_ATTRIBUTION_UIDS_TAGS_SIZES_NOT_EQUAL = 0x400; + public static final int ERROR_ATTRIBUTION_UIDS_TAGS_SIZES_NOT_EQUAL = 0x1000; // Size limits. @@ -593,9 +593,9 @@ public final class StatsEvent { if (0 == mErrorMask) { mBuffer.putByte(POS_NUM_ELEMENTS, (byte) mNumElements); } else { - mBuffer.putByte(0, TYPE_ERRORS); - mBuffer.putByte(POS_NUM_ELEMENTS, (byte) 3); + mPos += mBuffer.putByte(mPos, TYPE_ERRORS); mPos += mBuffer.putInt(mPos, mErrorMask); + mBuffer.putByte(POS_NUM_ELEMENTS, (byte) 3); size = mPos; } |