Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I4b58610f,Ib758756a into oc-dev

Browse Source 
* 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.
This commit is contained in:
TreeHugger Robot
2017-05-31 01:07:21 +00:00
committed by Android (Google) Code Review
parent 13eef357d6 c91663674c
commit a9873bc8f6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/util/proto/ProtoOutputStream.java
View File

@@ -1593,7 +1593,7 @@ public final class ProtoOutputStream {
assertNotCompacted(); assertNotCompacted();
final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_FIXED64); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_FIXED64);
writeRepeatedFixed64(id, val); writeRepeatedFixed64Impl(id, val);
} }
private void writeRepeatedFixed64Impl(int id, long val) { private void writeRepeatedFixed64Impl(int id, long val) {
@@ -1720,7 +1720,7 @@ public final class ProtoOutputStream {
assertNotCompacted(); assertNotCompacted();
final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_SFIXED64); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_SFIXED64);
writeRepeatedSFixed64(id, val); writeRepeatedSFixed64Impl(id, val);
} }
private void writeRepeatedSFixed64Impl(int id, long val) { private void writeRepeatedSFixed64Impl(int id, long val) {
@@ -1785,7 +1785,7 @@ public final class ProtoOutputStream {
assertNotCompacted(); assertNotCompacted();
final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_BOOL); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_BOOL);
writeRepeatedBool(id, val); writeRepeatedBoolImpl(id, val);
} }
private void writeRepeatedBoolImpl(int id, boolean val) { private void writeRepeatedBoolImpl(int id, boolean val) {

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

@@ -180,7 +180,9 @@ public class SparseMappingTableTest extends TestCase {
try { try {
table.getValue(key); 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) { } catch (RuntimeException ex) {
// Good // Good
} }