Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af14107e authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge changes from topic "nullablecollection" am: 60f3d5ce am: 57dd6872 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6baaacb15e7575f837da727ecbe6643dd93dfb4
parents 98eb82a6 57dd6872

core/java/android/window/TaskOrganizer.java

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.BinderThread; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.app.ActivityManager;

import android.os.RemoteException;
@@ -101,6 +102,7 @@ public class TaskOrganizer extends WindowOrganizer { 
    /** Gets direct child tasks (ordered from top-to-bottom) */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @Nullable

    @SuppressLint("NullableCollection")

    public static List<ActivityManager.RunningTaskInfo> getChildTasks(

            @NonNull WindowContainerToken parent, @NonNull int[] activityTypes) {

        try {
@@ -113,6 +115,7 @@ public class TaskOrganizer extends WindowOrganizer { 
    /** Gets all root tasks on a display (ordered from top-to-bottom) */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @Nullable

    @SuppressLint("NullableCollection")

    public static List<ActivityManager.RunningTaskInfo> getRootTasks(

            int displayId, @NonNull int[] activityTypes) {

        try {