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"

Browse Source
This commit is contained in:
Treehugger Robot
2022-01-21 14:58:19 +00:00
committed by Gerrit Code Review
parent 4939f35ba3 7cddc6a227
commit 4d7383001f
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) { private void addActiveRoute(BluetoothRouteInfo btRoute) {
if (btRoute == null) {
if (DEBUG) {
Log.d(TAG, " btRoute is null");
}
return;
}
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Adding active route: " + btRoute.route); 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; return;
} }
setRouteConnectionState(btRoute, STATE_CONNECTED); setRouteConnectionState(btRoute, STATE_CONNECTED);