Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev

Browse Source 
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
  Hide DISALLOW_OUTGOING_BEAM API
This commit is contained in:
Amith Yamasani
2014-10-14 19:57:46 +00:00
committed by Android Git Automerger
parent a861a9d713 15a5f82f9b
commit 4bf0356ee2
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -22333,7 +22333,6 @@ package android.os {
field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";
field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";
field public static final java.lang.String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";
field public static final java.lang.String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";
field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";

1
core/java/android/os/UserManager.java
View File

@@ -367,6 +367,7 @@ public class UserManager {
* <p/>Type: Boolean
* @see #setUserRestrictions(Bundle)
* @see #getUserRestrictions()
* @hide
*/
public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";