From 05838899278164d35225a9498c60961bc2e469b7 Mon Sep 17 00:00:00 2001 From: Alex Shabalin Date: Wed, 5 Feb 2025 19:05:57 -0800 Subject: Fix unit tests for `enable_output_switcher_session_grouping`. Additionally, add a null check for the `getSessionName` call. Flag: EXEMPT TEST_ONLY Bug: 388347018 Test: atest SystemUiRoboTests:MediaOutputAdapterTest Change-Id: Id2c3597cacd12dc83664d6853d1523f49527ebb2 --- .../SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java | 1 + .../SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java | 1 + 2 files changed, 2 insertions(+) (limited to 'packages/SettingsLib/src') diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java index 13276608c03d..69e41a36f48f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java @@ -618,6 +618,7 @@ public abstract class InfoMediaManager { return getActiveRoutingSession().getVolume(); } + @Nullable CharSequence getSessionName() { return getActiveRoutingSession().getName(); } diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java index 76f366d3d1b6..ed58c96b33c7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -444,6 +444,7 @@ public class LocalMediaManager implements BluetoothCallback { * * @return current name of the session, and return {@code null} if not found. */ + @Nullable public CharSequence getSessionName() { return mInfoMediaManager.getSessionName(); } -- cgit v1.2.3-59-g8ed1b