summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2018-08-22 23:09:27 +0200
committerJorim Jaggi <jjaggi@google.com>2018-08-23 00:59:25 +0200
commit3a04d242688f4c74925b53ef444371bb08a43d46 (patch)
tree4867492f5b89b6457aebbd73ffc35cab231eaa55
parentab39f605b1d64fad6b6c3ee0ddcb28cb7c77fddf (diff)
downloadbase-3a04d242688f4c74925b53ef444371bb08a43d46.tar.gz
DO NOT MERGE Do not kill processes when screen size changes
Causes too much of a process restart storm. Test: Switch cutout option Bug: 112876936 Change-Id: I76909bd292c7d6b28c673f068c408885da0d92c1
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index ee4bedf37abb..444ad8e2ced7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -26874,14 +26874,11 @@ public class ActivityManagerService extends IActivityManager.Stub
@Override
public void notifyDefaultDisplaySizeChanged() {
synchronized (this) {
- if (mSystemServiceManager.isBootCompleted()) {
- Slog.i(TAG, "Killing processes because of display size change");
- killAllBackgroundProcessesExcept(-1, ActivityManager.PROCESS_STATE_SERVICE);
+ if (mSystemServiceManager.isBootCompleted() && mHomeProcess != null) {
// TODO: Ugly hack to unblock the release
- if (mHomeProcess != null) {
- removeProcessLocked(mHomeProcess, false, true, "kill home screen size");
- }
+ Slog.i(TAG, "Killing home process because of display size change");
+ removeProcessLocked(mHomeProcess, false, true, "kill home screen size");
}
}
}