diff options
| author | Craig Mautner <cmautner@google.com> | 2013-08-27 21:20:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-27 21:20:30 +0000 |
| commit | ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3 (patch) | |
| tree | e5fd79f9fa7ac8fbbf3b5f62868b1d80cb69a8fc | |
| parent | d381680b63a36f8a4f1b07286947f1227d83139d (diff) | |
| parent | 2703052413387a0ba9d66f04b6e0421d5f59674e (diff) | |
| download | frameworks_base-ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3.zip frameworks_base-ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3.tar.gz frameworks_base-ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3.tar.bz2 | |
Merge "Hide stackId from prying eyes." into klp-dev
| -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 3325dc6..d249280 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2991,7 +2991,6 @@ package android.app { field public int id; field public android.content.ComponentName origActivity; field public int persistentId; - field public int stackId; } 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 6ac2e80..7c40bb1 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -490,6 +490,7 @@ public class ActivityManager { /** * The id of the ActivityStack this Task was on most recently. + * @hide */ public int stackId; |