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

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

Browse Source 
Change-Id: I842dc5ef97c235703514acd2dc8c063a7113d564
This commit is contained in:
TreeHugger Robot
2020-03-30 02:54:15 +00:00
committed by Automerger Merge Worker
parent 913fd11016 e7647d94b4
commit 587127a3bf
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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