diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-28 13:48:39 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-07-28 21:10:16 +0000 |
| commit | 22132d7950e57603e14259a337d6461d8478f07a (patch) | |
| tree | 514199cdf799d517fa5df62f222a3a013b126d24 | |
| parent | a7dc1702afe21294f889c38fa6ad6b748e84f0e5 (diff) | |
| download | frameworks_base-22132d7950e57603e14259a337d6461d8478f07a.zip frameworks_base-22132d7950e57603e14259a337d6461d8478f07a.tar.gz frameworks_base-22132d7950e57603e14259a337d6461d8478f07a.tar.bz2 | |
Make affiliatedTaskId public and unhidden.
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().
Fixes bug 16546323.
Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 183c1a0..8302bba 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3601,6 +3601,7 @@ package android.app { method public void readFromParcel(android.os.Parcel); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; + field public int affiliatedTaskId; field public android.content.Intent baseIntent; field public java.lang.CharSequence description; field public int id; diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index d43db78..fc200550 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -697,7 +697,6 @@ public class ActivityManager { /** * Task affiliation for grouping with other tasks. - * @hide */ public int affiliatedTaskId; |