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

Merge "Check mBtRouteProvider for null before calling methods on it" into rvc-dev am: 7da79bf250

Browse Source 
Change-Id: Ie4a7f3c92c81b87ec6ad467da93768b919458d95
This commit is contained in:
TreeHugger Robot
2020-04-16 01:26:14 +00:00
committed by Automerger Merge Worker
parent 41d1d4daaf 7da79bf250
commit 0a5ea805f3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
View File

@@ -261,9 +261,11 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
.build(); .build();
builder.addSelectedRoute(mSelectedRouteId); builder.addSelectedRoute(mSelectedRouteId);
if (mBtRouteProvider != null) {
for (MediaRoute2Info route : mBtRouteProvider.getTransferableRoutes()) { for (MediaRoute2Info route : mBtRouteProvider.getTransferableRoutes()) {
builder.addTransferableRoute(route.getId()); builder.addTransferableRoute(route.getId());
} }
}
RoutingSessionInfo newSessionInfo = builder.setProviderId(mUniqueId).build(); RoutingSessionInfo newSessionInfo = builder.setProviderId(mUniqueId).build();
if (Objects.equals(oldSessionInfo, newSessionInfo)) { if (Objects.equals(oldSessionInfo, newSessionInfo)) {