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

Commit f82483ec authored by RoboErik's avatar RoboErik Committed by Android Git Automerger
Browse files

am c14e2251: am 3c951d03: Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 

* commit 'c14e2251b1fc4460134acd4b1a18815b19cc03e4':
  Add javadoc to Window.set/getMediaController
parents 82e65f75 6f2b2b0c

core/java/android/view/Window.java

+10 −0
Original line number Diff line number Diff line
@@ -1304,12 +1304,22 @@ public abstract class Window { 
    public abstract int getVolumeControlStream();



    /**

     * Sets a {@link MediaController} to send media keys and volume changes to.

     * If set, this should be preferred for all media keys and volume requests

     * sent to this window.

     *

     * @param controller The controller for the session which should receive

     *            media keys and volume changes.

     * @see android.app.Activity#setMediaController(android.media.session.MediaController)

     */

    public void setMediaController(MediaController controller) {

    }



    /**

     * Gets the {@link MediaController} that was previously set.

     *

     * @return The controller which should receive events.

     * @see #setMediaController(android.media.session.MediaController)

     * @see android.app.Activity#getMediaController()

     */

    public MediaController getMediaController() {