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 am: 93716bef49 am: f8cc63bb59 am: 46f01a2d04

Browse Source 
Change-Id: Ib710242e796c5ead63594910bb61a23865c8702a
This commit is contained in:
TreeHugger Robot
2020-03-30 18:10:10 +00:00
committed by Automerger Merge Worker
parent a9f2caceab 46f01a2d04
commit 5e3f006451
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);
// .getInstance returns null if there is no bt adapter available
mBtRouteProvider = BluetoothRouteProvider.getInstance(context, (routes) -> {
publishProviderState();
@@ -116,10 +117,12 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
mContext.registerReceiver(new VolumeChangeReceiver(),
new IntentFilter(AudioManager.VOLUME_CHANGED_ACTION));
mHandler.post(() -> {
mBtRouteProvider.start();
notifyProviderState();
});
if (mBtRouteProvider != null) {
mHandler.post(() -> {
mBtRouteProvider.start();
notifyProviderState();
});
}
}
@Override
@@ -153,10 +156,12 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
@Override
public void transferToRoute(long requestId, String sessionId, String routeId) {
if (TextUtils.equals(routeId, mDeviceRoute.getId())) {
mBtRouteProvider.transferTo(null);
} else {
mBtRouteProvider.transferTo(routeId);
if (mBtRouteProvider != null) {
if (TextUtils.equals(routeId, mDeviceRoute.getId())) {
mBtRouteProvider.transferTo(null);
} else {
mBtRouteProvider.transferTo(routeId);
}
}
}
@@ -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();