Merge changes I4b58610f,Ib758756a into oc-dev (b3b191e3) · Commits · e / os / android_frameworks_base

core/java/android/util/proto/ProtoOutputStream.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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) {

+3 −1

Original line number	Diff line number	Diff line
		@@ -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
		}