From 5e896ddd3a2d828cdb86e3790ce483dda03392b5 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Mon, 12 Jun 2023 16:04:47 -0700
Subject: [PATCH] Audio focus: no "strong duck" for navigation use case

Only USAGE_ASSISTANT qualifies for strong duck.

Bug: 283690263
Test: play driving directions while playing media
Change-Id: If6bbd9b50d0ce14fc194a4d214fd208702688926
---
 .../java/com/android/server/audio/PlaybackActivityMonitor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
index 9fc00382d396f..50ffbcb9f4c46 100644
--- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
+++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
@@ -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;