summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2021-05-25 21:57:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-25 21:57:37 +0000
commitc1e65680bff7fa65b12081da26a7d2ba533e69d9 (patch)
treecf2261d639367dd817356cd2a0f45c89c6a0542c
parentcd77682736f8e13a5a4124e086e2fa11160b5639 (diff)
parente479c0d212242f17fbb8211d6d83848301f3cadd (diff)
Merge "Skip noteAppKill if the attaching pid is unknown to us" into sc-dev
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 5f9576120cc5..88f4fc2d59f8 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4324,8 +4324,8 @@ public class ActivityManagerService extends IActivityManager.Stub
if (pid > 0 && pid != MY_PID) {
killProcessQuiet(pid);
//TODO: killProcessGroup(app.info.uid, pid);
- mProcessList.noteAppKill(app, ApplicationExitInfo.REASON_INITIALIZATION_FAILURE,
- ApplicationExitInfo.SUBREASON_UNKNOWN, "attach failed");
+ // We can't log the app kill info for this process since we don't
+ // know who it is, so just skip the logging.
} else {
try {
thread.scheduleExit();