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

Merge "This assert is triggering when it shouldn\'t be. Disable it for now." into nyc-dev

Browse Source 
am: e93fecf

* commit 'e93fecf9a3c0740a05dde42e3dee1de9706cd4ac':
  This assert is triggering when it shouldn't be. Disable it for now.

Change-Id: I1f2578a7e2fcdd7d1f45d1958467aa775241fab5
This commit is contained in:
Joe Onorato
2016-04-09 00:42:54 +00:00
committed by android-build-merger
parent 931690f28a e93fecf9a3
commit d6db6b3dc6
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/com/android/internal/app/procstats/SparseMappingTable.java
View File

@@ -372,29 +372,35 @@ public class SparseMappingTable {
* Throw an exception if one of a variety of internal consistency checks fails.
*/
private void assertConsistency() {
// Assert that our sequewnce number has been initialized. If it hasn't
// that means someone tried to read or write data without allocating it
// since we were created or reset.
if (mSequence == UNINITIALIZED_SEQUENCE) {
logOrThrow("mSequence == UNINITIALIZED_SEQUENCE in"
+ " SparseMappingTable.Table. -- "
+ dumpInternalState());
return;
}
// Something with this checking isn't working and is triggering
// more problems than it's helping to debug.
// Original bug: b/27045736
// New bug: b/27960286
if (false) {
// Assert that our sequence number has been initialized. If it hasn't
// that means someone tried to read or write data without allocating it
// since we were created or reset.
if (mSequence == UNINITIALIZED_SEQUENCE) {
logOrThrow("mSequence == UNINITIALIZED_SEQUENCE in"
+ " SparseMappingTable.Table. -- "
+ dumpInternalState());
return;
}
// Assert that our sequence number matches mParent's. If it isn't that means
// we have been reset and our
if (mSequence != mParent.mSequence) {
if (mSequence < mParent.mSequence) {
logOrThrow("Sequence mismatch. SparseMappingTable.resetTable()"
+ " called but not Table.resetTable() -- "
+ dumpInternalState());
return;
} else if (mSequence > mParent.mSequence) {
logOrThrow("Sequence mismatch. Table.resetTable()"
+ " called but not SparseMappingTable.resetTable() -- "
+ dumpInternalState());
return;
// Assert that our sequence number matches mParent's. If it isn't that means
// we have been reset and our
if (mSequence != mParent.mSequence) {
if (mSequence < mParent.mSequence) {
logOrThrow("Sequence mismatch. SparseMappingTable.resetTable()"
+ " called but not Table.resetTable() -- "
+ dumpInternalState());
return;
} else if (mSequence > mParent.mSequence) {
logOrThrow("Sequence mismatch. Table.resetTable()"
+ " called but not SparseMappingTable.resetTable() -- "
+ dumpInternalState());
return;
}
}
}
}