diff options
| author | 2014-08-08 20:53:46 +0000 | |
|---|---|---|
| committer | 2014-08-08 16:09:03 +0000 | |
| commit | 4f70cacd45ca29e249cbfedf9ef8740eb1df9124 (patch) | |
| tree | 6fe813929f0baea79eb285c41abdfdf35860726b | |
| parent | 40bc0186d0f8945603760c606a6816f0d5ee6e28 (diff) | |
| parent | e9217a07292f6d1e7326bc52382e705e4d696165 (diff) | |
Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 |
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; |