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

am ef730e6e: Merge "Fix javadocs." into gingerbread

Browse Source 
Merge commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c' into gingerbread-plus-aosp

* commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c':
  Fix javadocs.
This commit is contained in:
Daniel Sandler
2010-06-22 11:10:18 -07:00
committed by Android Git Automerger
parent 6adf0c4de6 ef730e6ece
commit 57b5326561
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/ActivityInfo.java
View File

@@ -156,7 +156,7 @@ public class ActivityInfo extends ComponentInfo
* {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN} * {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN}
* may still be interrupted by high-priority notifications; for example, an * may still be interrupted by high-priority notifications; for example, an
* incoming phone call may use * 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 * to present a full-screen in-call activity to the user, pausing the
* current activity as a side-effect. An activity with * current activity as a side-effect. An activity with
* {@link #FLAG_IMMERSIVE} set, however, will not be interrupted; the * {@link #FLAG_IMMERSIVE} set, however, will not be interrupted; the