Merge changes from topic "ashabalin-fix-flag-related-tests" into main

* changes:
  Fix the UI for the `UserManager.DISALLOW_ADJUST_VOLUME` option.
  Consolidate the status icon and subtitle rendering.
  Fix unit tests for `enable_output_switcher_session_grouping`.

2 files changed, 2 insertions, 0 deletions

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();
     }