summaryrefslogtreecommitdiff
path: root/core/java/android/util
diff options
context:
space:
mode:
authorMuhammad Qureshi <muhammadq@google.com>2020-01-10 14:58:57 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-10 14:58:57 -0800
commit62dfd982347d08d0884f1439399802ff37c8ba18 (patch)
tree1e799839ce32cffa47c04c566673fdfd8d583341 /core/java/android/util
parentb310a107b75922dd503b5133f0049c2e70b6327c (diff)
parentbaa778df4d9a61190664fecb56e314eaca26e76a (diff)
Merge changes I2159bf13,I93146faa
am: baa778df4d Change-Id: I7208ca285d6fbeba6295041c6b91e85497e2e432
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/StatsEvent.java6
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;
}