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

Check mBtRouteProvider for null before calling methods on it

Browse Source 
line #250 allows it to be null.

Bug: 152647633
Test: boot, play vide in chrome
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I95074c50db10895e6e7eca6f3b46324d586d53bc
This commit is contained in:
Roman Kiryanov
2020-04-15 11:49:19 -07:00
parent adf530fc26
commit 3996130111
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();