summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-09-05 02:44:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-05 02:44:29 +0000
commiteebf6895fde7ef0d87c91d31b3abb36d4a98df66 (patch)
tree24cfbe940723f9fcef54e058338cbd082d4c2fc1 /core/java/android/content
parentadade10a5186636daaea50e90fddb50c3707d5ed (diff)
parent322d77185d6e8fe79642f27b653bb51677873cba (diff)
downloadframeworks_base-eebf6895fde7ef0d87c91d31b3abb36d4a98df66.zip
frameworks_base-eebf6895fde7ef0d87c91d31b3abb36d4a98df66.tar.gz
frameworks_base-eebf6895fde7ef0d87c91d31b3abb36d4a98df66.tar.bz2
Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/ActivityInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index 4f8a48c..8154bca 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -161,7 +161,7 @@ public class ActivityInfo extends ComponentInfo
*/
public static final int FLAG_SHOW_ON_LOCK_SCREEN = 0x0400;
/**
- * @hide Bit in {@link #flags} corresponding to an immersive activity
+ * Bit in {@link #flags} corresponding to an immersive activity
* that wishes not to be interrupted by notifications.
* Applications that hide the system notification bar with
* {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN}