Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "getActivityTokenBelow should exclude finishing activity" into sc-v2-dev am: 6a458ebd69

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15650745

Change-Id: Ief2fecee291102bc24cc64b1d8b17dd6d1444cb3
This commit is contained in:
Chris Li
2021-08-22 22:20:47 +00:00
committed by Automerger Merge Worker
parent d4e1826434 6a458ebd69
commit 05a96f6aae
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ActivityClient.java
View File

@@ -207,7 +207,8 @@ public class ActivityClient {
} }
/** /**
* Returns the activity token below in the same task if it belongs to the same process. * Returns the non-finishing activity token below in the same task if it belongs to the same
* process.
*/ */
@Nullable @Nullable
public IBinder getActivityTokenBelow(IBinder activityToken) { public IBinder getActivityTokenBelow(IBinder activityToken) {

4
services/core/java/com/android/server/wm/ActivityClientController.java
View File

@@ -554,7 +554,9 @@ class ActivityClientController extends IActivityClientController.Stub {
if (ar == null) { if (ar == null) {
return null; return null;
} }
final ActivityRecord below = ar.getTask().getActivityBelow(ar); // Exclude finishing activity.
final ActivityRecord below = ar.getTask().getActivity((r) -> !r.finishing,
ar, false /*includeBoundary*/, true /*traverseTopToBottom*/);
if (below != null && below.getUid() == ar.getUid()) { if (below != null && below.getUid() == ar.getUid()) {
return below.appToken.asBinder(); return below.appToken.asBinder();
} }