Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 186d4691 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "VolumeControlService: Fix for possible crash" am: 5ab7d8e3 am: 48b575f6 am: 5cb88c21 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2056892



Change-Id: I64795fa1a48dfd5aa96dc6eea434272fa5b12005
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed71817b 5cb88c21

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+5 −0
Original line number Diff line number Diff line
@@ -417,6 +417,11 @@ public class VolumeControlService extends ProfileService { 
     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public boolean okToConnect(BluetoothDevice device) {

        /* Make sure device is valid */

        if (device == null) {

            Log.e(TAG, "okToConnect: Invalid device");

            return false;

        }

        // Check if this is an incoming connection in Quiet mode.

        if (mAdapterService.isQuietModeEnabled()) {

            Log.e(TAG, "okToConnect: cannot connect to " + device + " : quiet mode enabled");