Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev
diff --git a/core/java/com/android/internal/app/procstats/AssociationState.java b/core/java/com/android/internal/app/procstats/AssociationState.java
index 86a356b..97f4b0f 100644
--- a/core/java/com/android/internal/app/procstats/AssociationState.java
+++ b/core/java/com/android/internal/app/procstats/AssociationState.java
@@ -103,12 +103,8 @@
@Nullable
private SourceState getCommonSourceState(boolean createIfNeeded) {
- if (mCommonSourceState == null) {
- if (createIfNeeded) {
- mCommonSourceState = mTargetProcess.getOrCreateSourceState(mKey);
- } else {
- Slog.wtf(TAG, "Unable to find common source state for " + mKey.mProcess);
- }
+ if (mCommonSourceState == null && createIfNeeded) {
+ mCommonSourceState = mTargetProcess.getOrCreateSourceState(mKey);
}
return mCommonSourceState;
}
@@ -225,7 +221,7 @@
}
mActiveProcState = mProcState;
}
- } else {
+ } else if (mAssociationState != null) {
Slog.wtf(TAG, "startActive while not tracking: " + this);
}
if (mAssociationState != null) {