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

Commit c15ca152 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "Audio focus: no "strong duck" for navigation use case" into udc-dev am:... 

Merge "Audio focus: no "strong duck" for navigation use case" into udc-dev am: 2cdaf2f5 am: 963af15a

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



Change-Id: I42a49494848ff587700df9b314a78e63207ce303
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16138830 963af15a

services/core/java/com/android/server/audio/PlaybackActivityMonitor.java

+1 −2
Original line number Diff line number Diff line
@@ -812,8 +812,7 @@ public final class PlaybackActivityMonitor 
            return false;

        }

        final int reqUsage = requester.getAudioAttributes().getUsage();

        if ((reqUsage == AudioAttributes.USAGE_ASSISTANT)

                || (reqUsage == AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)) {

        if (reqUsage == AudioAttributes.USAGE_ASSISTANT) {

            return true;

        }

        return false;