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

Merge changes from topic "nullablecollection" am: 60f3d5cee4 am: 57dd6872fd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6baaacb15e7575f837da727ecbe6643dd93dfb4
This commit is contained in:
Adrian Roos
2021-02-04 16:49:05 +00:00
committed by Automerger Merge Worker
parent 98eb82a6d3 57dd6872fd
commit af14107e13
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/window/TaskOrganizer.java
View File

@@ -20,6 +20,7 @@ import android.annotation.BinderThread;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SuppressLint;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.os.RemoteException; import android.os.RemoteException;
@@ -101,6 +102,7 @@ public class TaskOrganizer extends WindowOrganizer {
/** Gets direct child tasks (ordered from top-to-bottom) */ /** Gets direct child tasks (ordered from top-to-bottom) */
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
@Nullable @Nullable
@SuppressLint("NullableCollection")
public static List<ActivityManager.RunningTaskInfo> getChildTasks( public static List<ActivityManager.RunningTaskInfo> getChildTasks(
@NonNull WindowContainerToken parent, @NonNull int[] activityTypes) { @NonNull WindowContainerToken parent, @NonNull int[] activityTypes) {
try { try {
@@ -113,6 +115,7 @@ public class TaskOrganizer extends WindowOrganizer {
/** Gets all root tasks on a display (ordered from top-to-bottom) */ /** Gets all root tasks on a display (ordered from top-to-bottom) */
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
@Nullable @Nullable
@SuppressLint("NullableCollection")
public static List<ActivityManager.RunningTaskInfo> getRootTasks( public static List<ActivityManager.RunningTaskInfo> getRootTasks(
int displayId, @NonNull int[] activityTypes) { int displayId, @NonNull int[] activityTypes) {
try { try {