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

Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev am: d1c9c0785c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804421

Change-Id: Idf5b8833ea8efa7496d6647300459a4410fca9bd
This commit is contained in:
Jing Ji
2021-06-03 21:29:21 +00:00
committed by Automerger Merge Worker
parent 682f1a9f91 d1c9c0785c
commit 700394acca
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/app/procstats/AssociationState.java
View File

@@ -103,12 +103,8 @@ public final class AssociationState {
@Nullable @Nullable
private SourceState getCommonSourceState(boolean createIfNeeded) { private SourceState getCommonSourceState(boolean createIfNeeded) {
if (mCommonSourceState == null) { if (mCommonSourceState == null && createIfNeeded) {
if (createIfNeeded) { mCommonSourceState = mTargetProcess.getOrCreateSourceState(mKey);
mCommonSourceState = mTargetProcess.getOrCreateSourceState(mKey);
} else {
Slog.wtf(TAG, "Unable to find common source state for " + mKey.mProcess);
}
} }
return mCommonSourceState; return mCommonSourceState;
} }
@@ -225,7 +221,7 @@ public final class AssociationState {
} }
mActiveProcState = mProcState; mActiveProcState = mProcState;
} }
} else { } else if (mAssociationState != null) {
Slog.wtf(TAG, "startActive while not tracking: " + this); Slog.wtf(TAG, "startActive while not tracking: " + this);
} }
if (mAssociationState != null) { if (mAssociationState != null) {