Merge "DO NOT MERGE Do not kill processes when screen size changes" into pi-dev

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");
                 }
             }
         }