Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9873bc8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I4b58610f,Ib758756a into oc-dev 

* changes:
  Turn off the check in the test because the assertion is off in the implementation.
  Fix typos that cause infinite recursion and CTS test failure.
parents 13eef357 c9166367

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) {

core/tests/coretests/src/com/android/internal/app/procstats/SparseMappingTableTest.java

+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

        }