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

Commit e4aa7e77 authored by Andres Morales's avatar Andres Morales Committed by Android Git Automerger
Browse files

am 9e19c118: am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 

* commit '9e19c118':
  Unhide DISALLOW_OUTGOING_BEAM
parents 4eb22e44 9e19c118

core/java/android/os/UserManager.java

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