Merge "Check mBtRouteProvider for null before using it" into rvc-dev am: e7647d94b4

Change-Id: I842dc5ef97c235703514acd2dc8c063a7113d564

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

@@ -103,6 +103,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
         }
         updateDeviceRoute(newAudioRoutes);
 
+        // .getInstance returns null if there is no bt adapter available
         mBtRouteProvider = BluetoothRouteProvider.getInstance(context, (routes) -> {
             publishProviderState();
 
@@ -116,11 +117,13 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
         mContext.registerReceiver(new VolumeChangeReceiver(),
                 new IntentFilter(AudioManager.VOLUME_CHANGED_ACTION));
 
+        if (mBtRouteProvider != null) {
             mHandler.post(() -> {
                 mBtRouteProvider.start();
                 notifyProviderState();
             });
         }
+    }
 
     @Override
     public void requestCreateSession(long requestId, String packageName, String routeId,
@@ -153,12 +156,14 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
 
     @Override
     public void transferToRoute(long requestId, String sessionId, String routeId) {
+        if (mBtRouteProvider != null) {
             if (TextUtils.equals(routeId, mDeviceRoute.getId())) {
                 mBtRouteProvider.transferTo(null);
             } else {
                 mBtRouteProvider.transferTo(routeId);
             }
         }
+    }
 
     @Override
     public void setRouteVolume(long requestId, String routeId, int volume) {
@@ -294,7 +299,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
                     mDeviceRoute = new MediaRoute2Info.Builder(mDeviceRoute)
                             .setVolume(newVolume)
                             .build();
-                } else {
+                } else if (mBtRouteProvider != null) {
                     mBtRouteProvider.setSelectedRouteVolume(newVolume);
                 }
                 publishProviderState();