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

Merge "Merge "Fix the ordering of the result of app kill info" into rvc-dev am: da0d734c7d am: 6030f05717" into rvc-qpr-dev am: fc6c76fa85

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

Change-Id: I067aab2b8a2616be7f5f2bed4e3e1288c4d20f6a
This commit is contained in:
Automerger Merge Worker
2020-07-16 20:26:13 +00:00
parent d1971f557d fc6c76fa85
commit d49a31202f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/AppExitInfoTracker.java
View File

@@ -522,7 +522,7 @@ public final class AppExitInfoTracker {
AppExitInfoContainer container = records.get(filterUid); AppExitInfoContainer container = records.get(filterUid);
if (container != null) { if (container != null) {
mTmpInfoList.clear(); mTmpInfoList.clear();
results.addAll(container.toListLocked(mTmpInfoList, filterPid)); list.addAll(container.toListLocked(mTmpInfoList, filterPid));
} }
return AppExitInfoTracker.FOREACH_ACTION_NONE; return AppExitInfoTracker.FOREACH_ACTION_NONE;
}); });