Rename getTopActivity to getTopNonFinishingActivity (69/n)
Avoid name conflict with a method that will be introduced in
WindowContainer later on.
Bug: 80414790
Test: Existing tests pass
Change-Id: I299bb67d24fe581e14937079a071e13af9c693d2
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 79c76b9..6977a45 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -2410,7 +2410,7 @@
mStackSupervisor.findTaskToMoveToFront(task, flags, realOptions, "moveTaskToFront",
false /* forceNonResizable */);
- final ActivityRecord topActivity = task.getTopActivity();
+ final ActivityRecord topActivity = task.getTopNonFinishingActivity();
if (topActivity != null) {
// We are reshowing a task, use a starting window to hide the initial draw delay
@@ -2999,7 +2999,7 @@
public boolean isTopOfTask(IBinder token) {
synchronized (mGlobalLock) {
ActivityRecord r = ActivityRecord.isInStackLocked(token);
- return r != null && r.getTask().getTopActivity() == r;
+ return r != null && r.getTask().getTopNonFinishingActivity() == r;
}
}
@@ -3589,7 +3589,7 @@
"enqueueAssistContext()");
synchronized (mGlobalLock) {
- ActivityRecord activity = getTopDisplayFocusedStack().getTopActivity();
+ ActivityRecord activity = getTopDisplayFocusedStack().getTopNonFinishingActivity();
if (activity == null) {
Slog.w(TAG, "getAssistContextExtras failed: no top activity");
return null;
@@ -3722,7 +3722,7 @@
return false;
}
- final ActivityRecord activity = focusedStack.getTopActivity();
+ final ActivityRecord activity = focusedStack.getTopNonFinishingActivity();
if (activity == null) {
return false;
}
@@ -3737,7 +3737,7 @@
try {
synchronized (mGlobalLock) {
ActivityRecord caller = ActivityRecord.forTokenLocked(token);
- ActivityRecord top = getTopDisplayFocusedStack().getTopActivity();
+ ActivityRecord top = getTopDisplayFocusedStack().getTopNonFinishingActivity();
if (top != caller) {
Slog.w(TAG, "showAssistFromActivity failed: caller " + caller
+ " is not current top " + top);
@@ -4355,7 +4355,7 @@
public void startLocalVoiceInteraction(IBinder callingActivity, Bundle options) {
Slog.i(TAG, "Activity tried to startLocalVoiceInteraction");
synchronized (mGlobalLock) {
- ActivityRecord activity = getTopDisplayFocusedStack().getTopActivity();
+ ActivityRecord activity = getTopDisplayFocusedStack().getTopNonFinishingActivity();
if (ActivityRecord.forTokenLocked(callingActivity) != activity) {
throw new SecurityException("Only focused activity can call startVoiceInteraction");
}
@@ -6576,7 +6576,7 @@
+ " Requested task not found");
return null;
}
- final ActivityRecord activity = task.getTopActivity();
+ final ActivityRecord activity = task.getTopNonFinishingActivity();
if (activity == null) {
Slog.w(TAG, "getApplicationThreadForTopActivity failed:"
+ " Requested activity not found");