From 541cc0fccc90b2730c8e1ad4795a663dd6c15a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= <ivanbuper@google.com>
Date: Thu, 29 Dec 2022 18:40:44 +0000
Subject: [PATCH] Remove duplicated and unused methods in MR2ServiceImpl

Test: atest CtsMediaBetterTogetherTestCases
Bug: 205124386
Change-Id: I5dd229d26e43964ee7e1c69d61097578644f8c45
---
 .../server/media/MediaRouter2ServiceImpl.java | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index 55bc7b63a5553..c9ffd5d6185b1 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -66,6 +66,7 @@ import com.android.server.utils.EventLogger;
 import java.io.PrintWriter;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -2173,8 +2174,7 @@ class MediaRouter2ServiceImpl {
 
             // For system provider, notify all routers.
             if (provider == mSystemProvider) {
-                MediaRouter2ServiceImpl service = mServiceRef.get();
-                if (service == null) {
+                if (mServiceRef.get() == null) {
                     return;
                 }
                 notifySessionInfoChangedToRouters(getRouters(true), sessionInfo);
@@ -2189,7 +2189,7 @@ class MediaRouter2ServiceImpl {
                         + sessionInfo);
                 return;
             }
-            notifySessionInfoChangedToRouter(routerRecord, sessionInfo);
+            notifySessionInfoChangedToRouters(Arrays.asList(routerRecord.mRouter), sessionInfo);
         }
 
         private void onSessionReleasedOnHandler(@NonNull MediaRoute2Provider provider,
@@ -2280,16 +2280,6 @@ class MediaRouter2ServiceImpl {
             }
         }
 
-        private void notifySessionInfoChangedToRouter(@NonNull RouterRecord routerRecord,
-                @NonNull RoutingSessionInfo sessionInfo) {
-            try {
-                routerRecord.mRouter.notifySessionInfoChanged(sessionInfo);
-            } catch (RemoteException ex) {
-                Slog.w(TAG, "Failed to notify router of the session info change."
-                        + " Router probably died.", ex);
-            }
-        }
-
         private void notifySessionReleasedToRouter(@NonNull RouterRecord routerRecord,
                 @NonNull RoutingSessionInfo sessionInfo) {
             try {
@@ -2300,20 +2290,6 @@ class MediaRouter2ServiceImpl {
             }
         }
 
-        private List<IMediaRouter2> getAllRouters() {
-            final List<IMediaRouter2> routers = new ArrayList<>();
-            MediaRouter2ServiceImpl service = mServiceRef.get();
-            if (service == null) {
-                return routers;
-            }
-            synchronized (service.mLock) {
-                for (RouterRecord routerRecord : mUserRecord.mRouterRecords) {
-                    routers.add(routerRecord.mRouter);
-                }
-            }
-            return routers;
-        }
-
         private List<IMediaRouter2> getRouters(boolean hasModifyAudioRoutingPermission) {
             final List<IMediaRouter2> routers = new ArrayList<>();
             MediaRouter2ServiceImpl service = mServiceRef.get();