summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityManager.java
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-04-02 13:06:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-02 13:06:28 +0000
commit1ccace916c8fdc61f1a8db6677aed518d31647e6 (patch)
tree8104427e54d83661c1efb8ee8ee012d2f964958e /core/java/android/app/ActivityManager.java
parentb69bb445585a083b8e4ff8a13a1a1a63e9c22a6a (diff)
parent2a764949c943681a4d25a17a0b203a0127a4a486 (diff)
downloadframeworks_base-1ccace916c8fdc61f1a8db6677aed518d31647e6.zip
frameworks_base-1ccace916c8fdc61f1a8db6677aed518d31647e6.tar.gz
frameworks_base-1ccace916c8fdc61f1a8db6677aed518d31647e6.tar.bz2
Merge "Rename related users to profiles."
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
-rw-r--r--core/java/android/app/ActivityManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index d386eff..9d6a340 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -605,11 +605,11 @@ public class ActivityManager {
public static final int RECENT_IGNORE_UNAVAILABLE = 0x0002;
/**
- * Provides a list that also contains recent tasks for user
- * and related users.
+ * Provides a list that contains recent tasks for all
+ * profiles of a user.
* @hide
*/
- public static final int RECENT_INCLUDE_RELATED = 0x0004;
+ public static final int RECENT_INCLUDE_PROFILES = 0x0004;
/**
* Return a list of the tasks that the user has recently launched, with