From 3996130111564cd6ab0a531405f7224b5fc16188 Mon Sep 17 00:00:00 2001
From: Roman Kiryanov <rkir@google.com>
Date: Wed, 15 Apr 2020 11:49:19 -0700
Subject: [PATCH] Check mBtRouteProvider for null before calling methods on it

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
---
 .../com/android/server/media/SystemMediaRoute2Provider.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
index 6e2feeb15e214..1345e3759d2fb 100644
--- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
@@ -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();