diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | docs/html/preview/features/picture-in-picture.jd | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index c2d398794fa1..dec667e9b71c 100644 --- a/Android.mk +++ b/Android.mk @@ -495,6 +495,10 @@ LOCAL_JACK_FLAGS := --multi-dex native LOCAL_RMTYPEDEFS := true +ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) +LOCAL_EMMA_INSTRUMENT := true +endif + include $(BUILD_JAVA_LIBRARY) framework_module := $(LOCAL_INSTALLED_MODULE) diff --git a/docs/html/preview/features/picture-in-picture.jd b/docs/html/preview/features/picture-in-picture.jd index c089feb17670..03a17682a0a4 100644 --- a/docs/html/preview/features/picture-in-picture.jd +++ b/docs/html/preview/features/picture-in-picture.jd @@ -220,7 +220,11 @@ in any area that can be obscured by the PIP window.</p> <p>When an activity is in PIP mode, by default it doesn't get input focus. To receive input events while in PIP mode, use -<code>MediaSession.setMediaButtonReceiver()</code>.</p> +{@link android.media.session.MediaSession#setCallback +MediaSession.setCallback()}. For more information on using +{@link android.media.session.MediaSession#setCallback setCallback()} see +<a href="{@docRoot}training/tv/playback/now-playing.html">Displaying +a Now Playing Card</a>.</p> <p>When your app is in PIP mode, video playback in the PIP window can cause audio interference with another app, such as a music player app or voice search @@ -228,4 +232,4 @@ app. To avoid this, request audio focus when you start playing the video, and handle audio focus change notifications, as described in <a href="{@docRoot}training/managing-audio/audio-focus.html">Managing Audio Focus</a>. If you receive notification of audio focus loss when in PIP mode, -pause or stop video playback.</p>
\ No newline at end of file +pause or stop video playback.</p> |