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

Merge "MediaRouter: Update discovery request for unregister" into rvc-dev am: 5f971a2584

Browse Source 
Change-Id: I14238861bad9c24ac0550d597f034c128f9138b2
This commit is contained in:
Kyunglyul Hyun
2020-04-02 07:42:34 +00:00
committed by Automerger Merge Worker
parent 9f35679ff8 5f971a2584
commit f2c07e0b31
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,7 +493,7 @@ class MediaRouter2ServiceImpl {
} }
} }
//TODO: Review this is handling multi-user properly. //TODO(b/136703681): Review this is handling multi-user properly.
void switchUser() { void switchUser() {
synchronized (mLock) { synchronized (mLock) {
int userId = ActivityManager.getCurrentUser(); int userId = ActivityManager.getCurrentUser();
@@ -568,7 +568,9 @@ class MediaRouter2ServiceImpl {
UserRecord userRecord = routerRecord.mUserRecord; UserRecord userRecord = routerRecord.mUserRecord;
userRecord.mRouterRecords.remove(routerRecord); userRecord.mRouterRecords.remove(routerRecord);
//TODO: update discovery request userRecord.mHandler.sendMessage(
obtainMessage(UserHandler::updateDiscoveryPreferenceOnHandler,
userRecord.mHandler));
routerRecord.dispose(); routerRecord.dispose();
disposeUserIfNeededLocked(userRecord); // since router removed from user disposeUserIfNeededLocked(userRecord); // since router removed from user
} }
@@ -793,7 +795,7 @@ class MediaRouter2ServiceImpl {
} }
long uniqueRequestId = toUniqueRequestId(managerRecord.mManagerId, requestId); long uniqueRequestId = toUniqueRequestId(managerRecord.mManagerId, requestId);
//TODO: Use MediaRouter2's OnCreateSessionListener to send proper session hints. //TODO(b/152851868): Use MediaRouter2's OnCreateSessionListener to send session hints.
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::requestCreateSessionOnHandler, obtainMessage(UserHandler::requestCreateSessionOnHandler,
routerRecord.mUserRecord.mHandler, routerRecord.mUserRecord.mHandler,
@@ -1146,7 +1148,6 @@ class MediaRouter2ServiceImpl {
return mSessionToRouterMap.get(uniqueSessionId); return mSessionToRouterMap.get(uniqueSessionId);
} }
//TODO: notify session info updates
private void onProviderStateChangedOnHandler(@NonNull MediaRoute2Provider provider) { private void onProviderStateChangedOnHandler(@NonNull MediaRoute2Provider provider) {
int providerInfoIndex = getLastProviderInfoIndex(provider.getUniqueId()); int providerInfoIndex = getLastProviderInfoIndex(provider.getUniqueId());
MediaRoute2ProviderInfo providerInfo = provider.getProviderInfo(); MediaRoute2ProviderInfo providerInfo = provider.getProviderInfo();
@@ -1323,7 +1324,7 @@ class MediaRouter2ServiceImpl {
return true; return true;
} }
//TODO: Handle RCN case. //TODO(b/152950479): Handle RCN case.
if (routerRecord == null) { if (routerRecord == null) {
Slog.w(TAG, "Ignoring " + description + " route from unknown router."); Slog.w(TAG, "Ignoring " + description + " route from unknown router.");
return false; return false;