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 am: 0a5ea805f3

Browse Source 
Change-Id: I7a3e5b2953c84d79597e1108d990443d7d1d3ad0
This commit is contained in:
TreeHugger Robot
2020-04-16 01:48:47 +00:00
committed by Automerger Merge Worker
parent 1c3b682676 0a5ea805f3
commit 70f5a28020
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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