From 82b16fedb98f558c22ae71444ccb8fdcfa2b4df8 Mon Sep 17 00:00:00 2001
From: Daniel Chapin <chapin@google.com>
Date: Mon, 17 Aug 2020 23:32:41 +0000
Subject: [PATCH] Revert "AudioService: fix internal use of
 getDevicesForAttributes()"

Revert submission 12354482-fix_getDevicesForAttributes_internal

Reason for revert: SC blocking bug: 163642647
Reverted Changes:
I5b58be3e6:Revert "Revert "Fix mute issue when changing audio...
I864e42e69:AudioService: fix internal use of getDevicesForAtt...

Change-Id: I3eefec4a7af2f64ae0e9a6d89544b19610e51643
---
 .../core/java/com/android/server/audio/AudioService.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 48ca5f82330e9..b94396634530e 100755
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1338,7 +1338,7 @@ public class AudioService extends IAudioService.Stub
         }
 
         // Check if device to be updated is routed for the given audio stream
-        List<AudioDeviceAttributes> devicesForAttributes = getDevicesForAttributesInt(
+        List<AudioDeviceAttributes> devicesForAttributes = getDevicesForAttributes(
                 new AudioAttributes.Builder().setInternalLegacyStreamType(streamType).build());
         for (AudioDeviceAttributes deviceAttributes : devicesForAttributes) {
             if (deviceAttributes.getType() == AudioDeviceInfo.convertInternalDeviceToDeviceType(
@@ -1884,13 +1884,8 @@ public class AudioService extends IAudioService.Stub
     /** @see AudioManager#getDevicesForAttributes(AudioAttributes) */
     public @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributes(
             @NonNull AudioAttributes attributes) {
-        enforceModifyAudioRoutingPermission();
-        return getDevicesForAttributesInt(attributes);
-    }
-
-    protected @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributesInt(
-            @NonNull AudioAttributes attributes) {
         Objects.requireNonNull(attributes);
+        enforceModifyAudioRoutingPermission();
         return AudioSystem.getDevicesForAttributes(attributes);
     }