From b317b22ad99c0dc5f253ed2707610d91fcec2908 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Mon, 9 Nov 2015 11:14:10 -0800
Subject: [PATCH] Clear task bounds data when removing non-bounds persistable
 task.

Bug: 25584169
Change-Id: Ie68fa12bf182e988077e6410197f7f497f839ba2
---
 services/core/java/com/android/server/am/ActivityStack.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 6b8bdf86303e8..ea0db6b44a403 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -4539,6 +4539,11 @@ final class ActivityStack {
         if (!moving) {
             mStackSupervisor.removeLockedTaskLocked(task);
             mWindowManager.removeTask(task.taskId);
+            if (!StackId.persistTaskBounds(mStackId)) {
+                // Reset current bounds for task whose bounds shouldn't be persisted so it uses
+                // default configuration the next time it launches.
+                task.updateOverrideConfiguration(null);
+            }
         }
 
         final ActivityRecord r = mResumedActivity;