From eed82d58c7908223a1b751e2176f75a83ac72b3c Mon Sep 17 00:00:00 2001 From: hughchen Date: Fri, 20 Mar 2020 14:54:10 +0800 Subject: [PATCH] Update MediaRouter2Manager api Use releaseSession() to stop casting instead of release(). Bug: 152002708 Test: make -j42 RunSettingsLibRoboTests Change-Id: Ia7055440cd48791c7a074eaa7390db1877a6d065 --- .../android/settingslib/media/InfoMediaManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java index eb0ddfb492cbf..24cd55175f63a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java @@ -181,9 +181,13 @@ public class InfoMediaManager extends MediaManager { return false; } - final RoutingSessionInfo info = getRoutingSessionInfo(); - if (info != null) { - mRouterManager.getControllerForSession(info).release(); + + final List sessionInfos = + mRouterManager.getRoutingSessions(mPackageName); + final RoutingSessionInfo sessionInfo = sessionInfos.get(sessionInfos.size() - 1); + + if (sessionInfo != null) { + mRouterManager.releaseSession(sessionInfo); return true; }