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

Commit 5c547d1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "SystemServer: check null when Bluetooth crash" into main

parents 913996b4 67e72609

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,10 @@ class BluetoothManagerService { 
        Log.d(TAG, "unbindAndFinish(): mAdapter=" + mAdapter + " isBinding=" + isBinding());



        mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

        if (mAdapter == null) {

            // mAdapter can be null when Bluetooth crashed and sent SERVICE_DISCONNECTED

            return;

        }

        long currentTimeMs = System.currentTimeMillis();



        try {