Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf0356e authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

* commit '15a5f82f':
  Hide DISALLOW_OUTGOING_BEAM API
parents a861a9d7 15a5f82f

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/os/UserManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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";