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

Commit 0fee1dc8 authored Jul 25, 2014 by Michael Wright Committed by Android Git Automerger Jul 25, 2014

am 5f3eb6ca: am 5239ebe3: Add missing documentation for createVirtualDisplay

* commit '5f3eb6ca4ede2983501504e5acfec76725bb46bc':
  Add missing documentation for createVirtualDisplay

parents 83bb97d4 bc537dbc

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -467,7 +467,7 @@ import java.util.HashMap;
		*
		* static final int PICK_CONTACT_REQUEST = 0;
		*
		* protected boolean onKeyDown(int keyCode, KeyEvent event) {
		* public boolean onKeyDown(int keyCode, KeyEvent event) {
		* if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
		* // When the user center presses, let them pick a contact.
		* startActivityForResult(

core/java/android/hardware/display/DisplayManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -487,6 +487,8 @@ public final class DisplayManager {
		* {@link #VIRTUAL_DISPLAY_FLAG_SECURE}, {@link #VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY},
		* or {@link #VIRTUAL_DISPLAY_FLAG_SCREEN_SHARE}.
		* @param callbacks Callbacks to call when the state of the {@link VirtualDisplay} changes
		* @param handler The handler on which the listener should be invoked, or null
		* if the listener should be invoked on the calling thread's looper.
		* @return The newly created virtual display, or null if the application could
		* not create the virtual display.
		*