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

Merge "Add nullable annotations" into qt-dev

Browse Source 
am: 4b118856db

Change-Id: I6d7ee685a2ef3e8d94d0af0c97a45ab730a0da02
This commit is contained in:
Winson Chung
2019-04-15 17:53:16 -07:00
committed by android-build-merger
parent 99797108c3 4b118856db
commit 4259c81de7
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/current.txt
View File

@@ -6235,14 +6235,14 @@ package android.app {
} }
public class TaskInfo { public class TaskInfo {
field public android.content.ComponentName baseActivity; field @Nullable public android.content.ComponentName baseActivity;
field public android.content.Intent baseIntent; field @NonNull public android.content.Intent baseIntent;
field public boolean isRunning; field public boolean isRunning;
field public int numActivities; field public int numActivities;
field public android.content.ComponentName origActivity; field @Nullable public android.content.ComponentName origActivity;
field public android.app.ActivityManager.TaskDescription taskDescription; field @Nullable public android.app.ActivityManager.TaskDescription taskDescription;
field public int taskId; field public int taskId;
field public android.content.ComponentName topActivity; field @Nullable public android.content.ComponentName topActivity;
} }
public class TaskStackBuilder { public class TaskStackBuilder {

9
core/java/android/app/TaskInfo.java
View File

@@ -16,6 +16,8 @@
package android.app; package android.app;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
@@ -58,23 +60,27 @@ public class TaskInfo {
* The base intent of the task (generally the intent that launched the task). This intent can * The base intent of the task (generally the intent that launched the task). This intent can
* be used to relaunch the task (if it is no longer running) or brought to the front if it is. * be used to relaunch the task (if it is no longer running) or brought to the front if it is.
*/ */
@NonNull
public Intent baseIntent; public Intent baseIntent;
/** /**
* The component of the first activity in the task, can be considered the "application" of this * The component of the first activity in the task, can be considered the "application" of this
* task. * task.
*/ */
@Nullable
public ComponentName baseActivity; public ComponentName baseActivity;
/** /**
* The component of the top activity in the task, currently showing to the user. * The component of the top activity in the task, currently showing to the user.
*/ */
@Nullable
public ComponentName topActivity; public ComponentName topActivity;
/** /**
* The component of the target activity if this task was started from an activity alias. * The component of the target activity if this task was started from an activity alias.
* Otherwise, this is null. * Otherwise, this is null.
*/ */
@Nullable
public ComponentName origActivity; public ComponentName origActivity;
/** /**
@@ -82,6 +88,7 @@ public class TaskInfo {
* alias). * alias).
* @hide * @hide
*/ */
@Nullable
public ComponentName realActivity; public ComponentName realActivity;
/** /**
@@ -106,6 +113,7 @@ public class TaskInfo {
* The recent activity values for the highest activity in the stack to have set the values. * The recent activity values for the highest activity in the stack to have set the values.
* {@link Activity#setTaskDescription(android.app.ActivityManager.TaskDescription)}. * {@link Activity#setTaskDescription(android.app.ActivityManager.TaskDescription)}.
*/ */
@Nullable
public ActivityManager.TaskDescription taskDescription; public ActivityManager.TaskDescription taskDescription;
/** /**
@@ -126,6 +134,7 @@ public class TaskInfo {
* The current configuration of the task. * The current configuration of the task.
* @hide * @hide
*/ */
@NonNull
@UnsupportedAppUsage @UnsupportedAppUsage
public final Configuration configuration = new Configuration(); public final Configuration configuration = new Configuration();