From bb00d16f61da476e7bbd1e97e66f72d715d82862 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Thu, 29 Dec 2022 12:10:45 +0000
Subject: [PATCH 1/2] Minor MR2ServiceImpl non-functional simplification

Bug: 205124386
Test: N/A. Should be trivially non-functional.
Change-Id: Id8ea437cfdec55a753dd50a7c8aaa177d2d4c84a
---
 .../server/media/MediaRouter2ServiceImpl.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index d6846bed2a144..023d608a0a3d2 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -2138,17 +2138,17 @@ class MediaRouter2ServiceImpl {
                         + "session=" + matchingRequest.mOldSession);
             }
 
-            // Succeeded
+            mSessionToRouterMap.put(sessionInfo.getId(), matchingRequest.mRouterRecord);
             if (sessionInfo.isSystemSession()
                     && !matchingRequest.mRouterRecord.mHasModifyAudioRoutingPermission) {
-                notifySessionCreatedToRouter(matchingRequest.mRouterRecord,
-                        toOriginalRequestId(uniqueRequestId),
-                        mSystemProvider.getDefaultSessionInfo());
-            } else {
-                notifySessionCreatedToRouter(matchingRequest.mRouterRecord,
-                        toOriginalRequestId(uniqueRequestId), sessionInfo);
+                // The router lacks permission to modify system routing, so we hide system routing
+                // session info from them.
+                sessionInfo = mSystemProvider.getDefaultSessionInfo();
             }
-            mSessionToRouterMap.put(sessionInfo.getId(), matchingRequest.mRouterRecord);
+            notifySessionCreatedToRouter(
+                    matchingRequest.mRouterRecord,
+                    toOriginalRequestId(uniqueRequestId),
+                    sessionInfo);
         }
 
         private void onSessionInfoChangedOnHandler(@NonNull MediaRoute2Provider provider,

From 742a63f10d085c0531382db46968a504fbc668b3 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Thu, 29 Dec 2022 12:16:59 +0000
Subject: [PATCH 2/2] Fix MR2ServiceImpl nullability annotation

Test: Presubmit. No runtime changes. Only nullability annotation.
Bug: 205124386
Change-Id: I46ee33d934ed1b6594e607bf6278a50b38607654
---
 .../java/com/android/server/media/MediaRouter2ServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index 023d608a0a3d2..5baf269abb6d6 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -596,7 +596,7 @@ class MediaRouter2ServiceImpl {
 
     // Start of methods that implements operations for both MediaRouter2 and MediaRouter2Manager.
 
-    @NonNull
+    @Nullable
     public RoutingSessionInfo getSystemSessionInfo(
             @Nullable String packageName, boolean setDeviceRouteSelected) {
         final int uid = Binder.getCallingUid();