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

Commit c4c6635d authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 57b53265: am ef730e6e: Merge "Fix javadocs." into gingerbread 

Merge commit '57b53265'

* commit '57b53265':
  Fix javadocs.
parents 9b1c2a50 57b53265

core/java/android/content/pm/ActivityInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class ActivityInfo extends ComponentInfo 
     * {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN}

     * may still be interrupted by high-priority notifications; for example, an

     * incoming phone call may use

     * {@link * android.app.Notification#fullScreenIntent fullScreenIntent}

     * {@link android.app.Notification#fullScreenIntent fullScreenIntent}

     * to present a full-screen in-call activity to the user, pausing the

     * current activity as a side-effect. An activity with

     * {@link #FLAG_IMMERSIVE} set, however, will not be interrupted; the