From a8cc378d15b21c5d49c267fe300dbc7408dafb51 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Wed, 1 Jun 2016 12:20:10 -0700 Subject: [PATCH] Do not sanitize override config for fullscreen bug: 29063336 Change-Id: I65c5d635133a6b3791ce1aef63547f8d38ca24b5 --- services/core/java/com/android/server/am/TaskRecord.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index c0adad0b7194..578fc44e7832 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -1582,6 +1582,11 @@ final class TaskRecord { * @param globalConfig global configuration to update from. */ void sanitizeOverrideConfiguration(Configuration globalConfig) { + // If it's fullscreen, the override config should be empty and we should leave it alone. + if (mFullscreen) { + return; + } + // screenLayout field is set in #calculateOverrideConfig but only part of it is really // overridden - aspect ratio and size. Other flags (like layout direction) can be updated // separately in global config and they also must be updated in override config. -- 2.11.0