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

API: Suppress existing NullableCollections lints (TaskOrganizer)

Browse Source 
Bug: 152525509
Test: make checkapi
Change-Id: I5ce70d3e622fcdd13d63d47bf483507378a60e16
This commit is contained in:
Adrian Roos
2021-01-29 12:15:00 +01:00
parent d7f33cd648
commit c042e7c643
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

@@ -21,6 +21,7 @@ import android.annotation.CallSuper;
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.IBinder; import android.os.IBinder;
@@ -151,6 +152,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_TASKS) @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
@Nullable @Nullable
@SuppressLint("NullableCollection")
public List<ActivityManager.RunningTaskInfo> getChildTasks( public List<ActivityManager.RunningTaskInfo> getChildTasks(
@NonNull WindowContainerToken parent, @NonNull int[] activityTypes) { @NonNull WindowContainerToken parent, @NonNull int[] activityTypes) {
try { try {
@@ -163,6 +165,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_TASKS) @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
@Nullable @Nullable
@SuppressLint("NullableCollection")
public List<ActivityManager.RunningTaskInfo> getRootTasks( public List<ActivityManager.RunningTaskInfo> getRootTasks(
int displayId, @NonNull int[] activityTypes) { int displayId, @NonNull int[] activityTypes) {
try { try {