Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send features first and then routes when registering MR2Manager" into sc-dev

Browse Source
This commit is contained in:
Hyundo Moon
2021-07-01 07:31:39 +00:00
committed by Android (Google) Code Review
parent cfde5c2b96 9659c23091
commit 9c168a565a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
View File

@@ -903,9 +903,9 @@ class MediaRouter2ServiceImpl {
userRecord.mManagerRecords.add(managerRecord); userRecord.mManagerRecords.add(managerRecord);
mAllManagerRecords.put(binder, managerRecord); mAllManagerRecords.put(binder, managerRecord);
userRecord.mHandler.sendMessage(obtainMessage(UserHandler::notifyRoutesToManager, // Note: Features should be sent first before the routes. If not, the
userRecord.mHandler, manager)); // RouteCallback#onRoutesAdded() for system MR2 will never be called with initial routes
// due to the lack of features.
for (RouterRecord routerRecord : userRecord.mRouterRecords) { for (RouterRecord routerRecord : userRecord.mRouterRecords) {
// TODO: UserRecord <-> routerRecord, why do they reference each other? // TODO: UserRecord <-> routerRecord, why do they reference each other?
// How about removing mUserRecord from routerRecord? // How about removing mUserRecord from routerRecord?
@@ -913,6 +913,9 @@ class MediaRouter2ServiceImpl {
obtainMessage(UserHandler::notifyPreferredFeaturesChangedToManager, obtainMessage(UserHandler::notifyPreferredFeaturesChangedToManager,
routerRecord.mUserRecord.mHandler, routerRecord, manager)); routerRecord.mUserRecord.mHandler, routerRecord, manager));
} }
userRecord.mHandler.sendMessage(obtainMessage(UserHandler::notifyRoutesToManager,
userRecord.mHandler, manager));
} }
private void unregisterManagerLocked(@NonNull IMediaRouter2Manager manager, boolean died) { private void unregisterManagerLocked(@NonNull IMediaRouter2Manager manager, boolean died) {