summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/UserManager.java
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2014-11-06 12:30:48 -0800
committerAndres Morales <anmorales@google.com>2014-11-06 12:31:32 -0800
commitcd3b72e6f9a158ac492a4a8b5629d73b495a7d1e (patch)
treefaf911ca89530528aa2ae38ffa1b836d1677e665 /core/java/android/os/UserManager.java
parent808fe6f99fba753e0ec4c5e90de0ff7a2140e8a6 (diff)
downloadframeworks_base-cd3b72e6f9a158ac492a4a8b5629d73b495a7d1e.zip
frameworks_base-cd3b72e6f9a158ac492a4a8b5629d73b495a7d1e.tar.gz
frameworks_base-cd3b72e6f9a158ac492a4a8b5629d73b495a7d1e.tar.bz2
Unhide DISALLOW_OUTGOING_BEAM
Bug:17387303 Change-Id: If4410bbfd9f82c84886024a091454ee931d9d930
Diffstat (limited to 'core/java/android/os/UserManager.java')
-rw-r--r--core/java/android/os/UserManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 3234e77..1368f39 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -367,7 +367,6 @@ public class UserManager {
* <p/>Type: Boolean
* @see #setUserRestrictions(Bundle)
* @see #getUserRestrictions()
- * @hide
*/
public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";