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

Merge "audio: Fix possible NullPointerException when DEBUG is true" am: 4d7383001f am: 18b3180f5e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814782

Change-Id: I1542f0660b984382a3876e70c642e2bb22800f3f
This commit is contained in:
Treehugger Robot
2022-01-21 15:10:48 +00:00
committed by Automerger Merge Worker
parent 47b398bccf 18b3180f5e
commit 18062a4570
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/media/BluetoothRouteProvider.java
View File

@@ -344,10 +344,19 @@ class BluetoothRouteProvider {
}
private void addActiveRoute(BluetoothRouteInfo btRoute) {
if (btRoute == null) {
if (DEBUG) {
Log.d(TAG, " btRoute is null");
}
return;
}
if (DEBUG) {
Log.d(TAG, "Adding active route: " + btRoute.route);
}
if (btRoute == null || mActiveRoutes.contains(btRoute)) {
if (mActiveRoutes.contains(btRoute)) {
if (DEBUG) {
Log.d(TAG, " btRoute is already added.");
}
return;
}
setRouteConnectionState(btRoute, STATE_CONNECTED);