summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2022-05-03 10:17:55 +0800
committer Louis Chang <louischang@google.com> 2022-05-04 08:56:27 +0800
commit6f53188ebe94da2ea2a19b3b91979a2edd69a943 (patch)
tree6f892816f20326042c1a47793bb01aa8360ccc0c
parent239f082d758252b5bbf1e908f4d28b1b9d1141e7 (diff)
Execute pause timeout only when attached to a process
In order to prevent NPE since the #activityPaused assumed the app process existed. Bug: 230866778 Test: wm presubmit Change-Id: Id12b175e728f27150e1ae48e3e3af776eb08acf1
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index d00d8b8c9f8a..732cb71227ed 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -933,9 +933,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// so we need to be conservative and assume it isn't.
Slog.w(TAG, "Activity pause timeout for " + ActivityRecord.this);
synchronized (mAtmService.mGlobalLock) {
- if (hasProcess()) {
- mAtmService.logAppTooSlow(app, pauseTime, "pausing " + ActivityRecord.this);
+ if (!hasProcess()) {
+ return;
}
+ mAtmService.logAppTooSlow(app, pauseTime, "pausing " + ActivityRecord.this);
activityPaused(true);
}
}