summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jay Aliomer <aaliomer@google.com> 2019-11-27 13:00:56 -0500
committer Jay Aliomer <aaliomer@google.com> 2019-11-27 18:07:20 +0000
commitc6cf9e3f6cd81b3a1121c056e7af379c5846f9d6 (patch)
treec466a742bdd0289ea7029a5b3f63e9f6f6ce3a03
parent155d803a4b865f2eaf84cb902489485cf7632d14 (diff)
Performance regression when hot reloading
Max latency time for google maps hot reload have increased to over 30ms This change reverses a change made to an activity record Bug: 145161355 Test: atest ActivityRecordTests Change-Id: Idef1b2be6a41fa006b0cd2d2eb5864634830d186
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 3de3578a09f1..68d24f324308 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -1798,7 +1798,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// task snapshot starting window.
return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
}
- return snapshot == null ? STARTING_WINDOW_TYPE_SPLASH_SCREEN
+ return snapshot == null ? STARTING_WINDOW_TYPE_NONE
: snapshotOrientationSameAsTask(snapshot) || fromRecents
? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN;
} else {