From 416723dccd72aad0d4218f70b3168e6de37eb10f Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 26 May 2017 19:52:12 -0700 Subject: [PATCH 1/2] Fix typos that cause infinite recursion and CTS test failure. Bug: 37171450 Test: bit CtsProtoTestCases:* Change-Id: Ib758756a64fa19eb976dc0a2b1bb1cd6e42fd6f2 --- core/java/android/util/proto/ProtoOutputStream.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/util/proto/ProtoOutputStream.java b/core/java/android/util/proto/ProtoOutputStream.java index adf49387a05dc..480abc1482a33 100644 --- a/core/java/android/util/proto/ProtoOutputStream.java +++ b/core/java/android/util/proto/ProtoOutputStream.java @@ -1593,7 +1593,7 @@ public final class ProtoOutputStream { assertNotCompacted(); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_FIXED64); - writeRepeatedFixed64(id, val); + writeRepeatedFixed64Impl(id, val); } private void writeRepeatedFixed64Impl(int id, long val) { @@ -1720,7 +1720,7 @@ public final class ProtoOutputStream { assertNotCompacted(); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_SFIXED64); - writeRepeatedSFixed64(id, val); + writeRepeatedSFixed64Impl(id, val); } private void writeRepeatedSFixed64Impl(int id, long val) { @@ -1785,7 +1785,7 @@ public final class ProtoOutputStream { assertNotCompacted(); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_BOOL); - writeRepeatedBool(id, val); + writeRepeatedBoolImpl(id, val); } private void writeRepeatedBoolImpl(int id, boolean val) { From c91663674c07781864a062bf9164ec3853269bfb Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 26 May 2017 20:04:00 -0700 Subject: [PATCH 2/2] Turn off the check in the test because the assertion is off in the implementation. Bug: 38350004 Test: bit FrameworksCoreTests:com.android.internal.app.procstats.SparseMappingTableTest Change-Id: I4b58610fd1ac9ca082479a7d5ba40c69f0a26654 --- .../internal/app/procstats/SparseMappingTableTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java b/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java index fd57baa217b0f..115af5e0ea5d5 100644 --- a/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java +++ b/core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java @@ -180,7 +180,9 @@ public class SparseMappingTableTest extends TestCase { try { table.getValue(key); - throw new Exception("Exception not thrown after mismatched reset calls."); + // Turn off this assertion because the check in SparseMappingTable.assertConsistency + // is also turned off. + //throw new Exception("Exception not thrown after mismatched reset calls."); } catch (RuntimeException ex) { // Good }