Fix transferring of starting windows
Since we may transfer starting data we can not store
AppWindowToken in that class.
Additionally, remove starting window directly if it was
transferred. The normal removing path doesn't really work as
the fields aren't set.
Also fixes a monkey crash in the same code region.
Test: Open a notification that creates multiple activities with
using TaskStackBuilder, verify no windows leaking.
Test: (For monkey crash) Boot device, pray to the monkey god
Change-Id: I64fb176b579535adea1916d1623ad03ab06ca67e
Fixes: 34364463
Fixes: 34361417
Fixes: 34349533
diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index a900702..34f6752 100644
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -87,7 +87,6 @@
private final Runnable mRemoveStartingWindow = () -> {
StartingSurface surface = null;
- StartingData data = null;
synchronized (mWindowMap) {
if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Remove starting " + mContainer
+ ": startingWindow=" + mContainer.startingWindow
@@ -97,14 +96,13 @@
}
if (mContainer.startingWindow != null) {
surface = mContainer.startingSurface;
- data = mContainer.startingData;
mContainer.startingData = null;
mContainer.startingSurface = null;
mContainer.startingWindow = null;
mContainer.startingDisplayed = false;
}
}
- if (data != null && surface != null) {
+ if (surface != null) {
try {
surface.remove();
} catch (Exception e) {
@@ -115,12 +113,14 @@
private final Runnable mAddStartingWindow = () -> {
final StartingData startingData;
+ final AppWindowToken container;
synchronized (mWindowMap) {
if (mContainer == null) {
return;
}
startingData = mContainer.startingData;
+ container = mContainer;
}
if (startingData == null) {
@@ -129,41 +129,40 @@
}
if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Add starting "
- + this + ": startingData=" + mContainer.startingData);
+ + this + ": startingData=" + container.startingData);
StartingSurface surface = null;
try {
- surface = startingData.createStartingSurface();
+ surface = startingData.createStartingSurface(container);
} catch (Exception e) {
Slog.w(TAG_WM, "Exception when adding starting window", e);
}
if (surface != null) {
boolean abort = false;
synchronized(mWindowMap) {
- if (mContainer.removed || mContainer.startingData == null) {
+ if (container.removed || container.startingData == null) {
// If the window was successfully added, then
// we need to remove it.
- if (mContainer.startingWindow != null) {
+ if (container.startingWindow != null) {
if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM,
- "Aborted starting " + mContainer
- + ": removed=" + mContainer.removed
- + " startingData=" + mContainer.startingData);
+ "Aborted starting " + container
+ + ": removed=" + container.removed
+ + " startingData=" + container.startingData);
+ container.startingWindow = null;
+ container.startingData = null;
abort = true;
}
} else {
- mContainer.startingSurface = surface;
+ container.startingSurface = surface;
}
if (DEBUG_STARTING_WINDOW && !abort) Slog.v(TAG_WM,
"Added starting " + mContainer
+ ": startingWindow="
- + mContainer.startingWindow + " startingView="
- + mContainer.startingSurface);
+ + container.startingWindow + " startingView="
+ + container.startingSurface);
}
if (abort) {
- mRemoveStartingWindow.run();
- if (mContainer == null) {
- return;
- }
+ surface.remove();
}
}
};
@@ -465,7 +464,7 @@
}
if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Creating StartingData");
- mContainer.startingData = new SplashScreenStartingData(mService, mContainer, pkg, theme,
+ mContainer.startingData = new SplashScreenStartingData(mService, pkg, theme,
compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags,
mContainer.getMergedOverrideConfiguration());
scheduleAddStartingWindow();
@@ -499,8 +498,7 @@
return false;
}
- mContainer.startingData = new SnapshotStartingData(mService, mContainer,
- snapshot.getSnapshot());
+ mContainer.startingData = new SnapshotStartingData(mService, snapshot.getSnapshot());
scheduleAddStartingWindow();
return true;
}