From a19d0b80939590ab5f212ad360766119ff56b4b8 Mon Sep 17 00:00:00 2001
From: Alex Dadukin <adadukin@google.com>
Date: Tue, 10 Jan 2023 15:49:48 +0000
Subject: [PATCH] Move findBluetoothRouteWithRouteId closer to the usage and
 make private

Bug: b/255495104
Test: atest SystemMediaRouter2Test
Change-Id: Id893608f8b0f016c5f5a7fe90ff509e4fb498302
---
 .../server/media/BluetoothRouteProvider.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
index d0679449b9446..1d7f1245fff29 100644
--- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java
+++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
@@ -176,6 +176,18 @@ class BluetoothRouteProvider {
         }
     }
 
+    private BluetoothRouteInfo findBluetoothRouteWithRouteId(String routeId) {
+        if (routeId == null) {
+            return null;
+        }
+        for (BluetoothRouteInfo btRouteInfo : mBluetoothRoutes.values()) {
+            if (TextUtils.equals(btRouteInfo.mRoute.getId(), routeId)) {
+                return btRouteInfo;
+            }
+        }
+        return null;
+    }
+
     /**
      * Clears the active device for all known profiles.
      */
@@ -238,18 +250,6 @@ class BluetoothRouteProvider {
         return routes;
     }
 
-    BluetoothRouteInfo findBluetoothRouteWithRouteId(String routeId) {
-        if (routeId == null) {
-            return null;
-        }
-        for (BluetoothRouteInfo btRouteInfo : mBluetoothRoutes.values()) {
-            if (TextUtils.equals(btRouteInfo.mRoute.getId(), routeId)) {
-                return btRouteInfo;
-            }
-        }
-        return null;
-    }
-
     /**
      * Updates the volume for {@link AudioManager#getDevicesForStream(int) devices}.
      *