From 963d1880ca70ce78be4c711fe1b6574ef63ade83 Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Fri, 4 Sep 2020 12:07:58 +0800 Subject: [PATCH] Don't finish noHistory activity while it is on the topmost. There was no top running activity in the target task result in the NPE. The CL makes sure the top running noHistory activity is not finished when launched again and have protection for getTopNonFinishingActivity. Bug: 159507052 Test: atest testNoHistoryActivityNotFinished Change-Id: Id582f28d79bec052115e07d98c097c7d50c11609 --- .../core/java/com/android/server/wm/ActivityStarter.java | 5 +++-- services/core/java/com/android/server/wm/Task.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index e8e4059af3247..0f15dd2068ba8 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1493,9 +1493,10 @@ class ActivityStarter { // anyone interested in this piece of information. final Task homeStack = targetTask.getDisplayArea().getRootHomeTask(); final boolean homeTaskVisible = homeStack != null && homeStack.shouldBeVisible(null); + final ActivityRecord top = targetTask.getTopNonFinishingActivity(); + final boolean visible = top != null && top.isVisible(); mService.getTaskChangeNotificationController().notifyActivityRestartAttempt( - targetTask.getTaskInfo(), homeTaskVisible, clearedTask, - targetTask.getTopNonFinishingActivity().isVisible()); + targetTask.getTaskInfo(), homeTaskVisible, clearedTask, visible); } } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index b7a5d05486c48..d5749ba140baa 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -6036,8 +6036,9 @@ class Task extends WindowContainer { // If the most recent activity was noHistory but was only stopped rather // than stopped+finished because the device went to sleep, we need to make // sure to finish it as we're making a new activity topmost. - if (shouldSleepActivities() && mLastNoHistoryActivity != null && - !mLastNoHistoryActivity.finishing) { + if (shouldSleepActivities() && mLastNoHistoryActivity != null + && !mLastNoHistoryActivity.finishing + && mLastNoHistoryActivity != next) { if (DEBUG_STATES) Slog.d(TAG_STATES, "no-history finish of " + mLastNoHistoryActivity + " on new resume"); mLastNoHistoryActivity.finishIfPossible("resume-no-history", false /* oomAdj */);