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

Commit 81bcc784 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "NotificationPlayer: use AUDIOFOCUS_GAIN_TRANSIENT instead of... 

Merge "NotificationPlayer: use AUDIOFOCUS_GAIN_TRANSIENT instead of AUDIOFOCUS_GAIN in looping mode" am: 1622d409 am: 551484f3

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



Change-Id: I218c86b2a13912716ad46e1cf95d918c3b2a76df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f60adb6 551484f3

packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class NotificationPlayer implements OnCompletionListener, OnErrorListener 
                                    if (DEBUG) Log.d(mTag, "requesting AudioFocus");

                                    int focusGain = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK;

                                    if (mCmd.looping) {

                                        focusGain = AudioManager.AUDIOFOCUS_GAIN;

                                        focusGain = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT;

                                    }

                                    mNotificationRampTimeMs = audioManager.getFocusRampTimeMs(

                                            focusGain, mCmd.attributes);