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

Commit adcb9a22 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unicode quotes in javadoc for AudioFocusRequest and MediaPlayer"...

Merge "Remove unicode quotes in javadoc for AudioFocusRequest and MediaPlayer" into udc-qpr-dev am: 6e83117b am: dfcc0af4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24187265



Change-Id: Ia94fe033c105c592b8186e157c93e22fd0cdb937
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d0a73c8 dfcc0af4
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import android.os.Looper;
 * but there is only one the user would really listen to (focus on), while the other plays in
 * the background. An example of this is driving directions being spoken while music plays at
 * a reduced volume (a.k.a. ducking).
 * <p>When an application requests audio focus, it expresses its intention to own audio focus to
 * play audio. Lets review the different types of focus requests, the return value after a request,
 * <p>When an application requests audio focus, it expresses its intention to "own" audio focus to
 * play audio. Let's review the different types of focus requests, the return value after a request,
 * and the responses to a loss.
 * <p class="note">Note: applications should not play anything until granted focus.</p>
 *
@@ -51,7 +51,7 @@ import android.os.Looper;
 * <li>{@link AudioManager#AUDIOFOCUS_GAIN} expresses the fact that your application is now the
 * sole source of audio that the user is listening to. The duration of the audio playback is
 * unknown, and is possibly very long: after the user finishes interacting with your application,
 * (s)he doesnt expect another audio stream to resume. Examples of uses of this focus gain are
 * (s)he doesn't expect another audio stream to resume. Examples of uses of this focus gain are
 * for music playback, for a game or a video player.</li>
 *
 * <li>{@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT} is for a situation when you know your
@@ -60,20 +60,20 @@ import android.os.Looper;
 * for playing an alarm, or during a VoIP call. The playback is known to be finite: the alarm will
 * time-out or be dismissed, the VoIP call has a beginning and an end. When any of those events
 * ends, and if the user was listening to music when it started, the user expects music to resume,
 * but didnt wish to listen to both at the same time.</li>
 * but didn't wish to listen to both at the same time.</li>
 *
 * <li>{@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK}: this focus request type is similar
 * to {@code AUDIOFOCUS_GAIN_TRANSIENT} for the temporary aspect of the focus request, but it also
 * expresses the fact during the time you own focus, you allow another application to keep playing
 * at a reduced volume, ducked. Examples are when playing driving directions or notifications,
 * its ok for music to keep playing, but not loud enough that it would prevent the directions to
 * be hard to understand. A typical attenuation by the ducked application is a factor of 0.2f
 * at a reduced volume, "ducked". Examples are when playing driving directions or notifications,
 * it's ok for music to keep playing, but not loud enough that it would prevent the directions to
 * be hard to understand. A typical attenuation by the "ducked" application is a factor of 0.2f
 * (or -14dB), that can for instance be applied with {@code MediaPlayer.setVolume(0.2f)} when
 * using this class for playback.</li>
 *
 * <li>{@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE} is also for a temporary request,
 * but also expresses that your application expects the device to not play anything else. This is
 * typically used if you are doing audio recording or speech recognition, and dont want for
 * typically used if you are doing audio recording or speech recognition, and don't want for
 * examples notifications to be played by the system during that time.</li>
 * </ul>
 *
+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ public class MediaPlayer extends PlayerBase
     * this API to pass the cookies as a list of HttpCookie. If the app has not installed
     * a CookieHandler already, this API creates a CookieManager and populates its CookieStore with
     * the provided cookies. If the app has installed its own handler already, this API requires the
     * handler to be of CookieManager type such that the API can update the managers CookieStore.
     * handler to be of CookieManager type such that the API can update the manager's CookieStore.
     *
     * <p><strong>Note</strong> that the cross domain redirection is allowed by default,
     * but that can be changed with key/value pairs through the headers parameter with