summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/app/ActivityManager.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 851458448064..d4bffe853b55 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3673,6 +3673,7 @@ package android.app {
field public int id;
field public android.content.ComponentName origActivity;
field public int persistentId;
+ field public android.app.ActivityManager.TaskDescription taskDescription;
}
public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 3bf8e2e4943c..4b022ff30895 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -690,8 +690,6 @@ public class ActivityManager {
/**
* The recent activity values for the highest activity in the stack to have set the values.
* {@link Activity#setTaskDescription(android.app.ActivityManager.TaskDescription)}.
- *
- * @hide
*/
public TaskDescription taskDescription;