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

Commit 06525241 authored by Junyeong Bak's avatar Junyeong Bak Committed by Automerger Merge Worker
Browse files

Modified NPE and typo of abbreviation of log tag am: e497c26a am: 286346de... 

Modified NPE and typo of abbreviation of log tag am: e497c26a am: 286346de am: c11bc1a7 am: 3e9454cf

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2675396



Change-Id: I72944bdc23bc6c493c14f87afd45b949fc9d5fae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 772281cb 3e9454cf

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+6 −3
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ public class BluetoothDeviceManager { 
            public void onGroupStatusChanged(int groupId, int groupStatus) {}

            @Override

            public void onGroupNodeAdded(BluetoothDevice device, int groupId) {

                Log.i(this, device.getAddress() + " group added " + groupId);

                Log.i(this, (device == null ? "device is null" : device.getAddress())

                        + " group added " + groupId);

                if (device == null || groupId == BluetoothLeAudio.GROUP_ID_INVALID) {

                    Log.w(this, "invalid parameter");

                    return;
@@ -73,6 +74,8 @@ public class BluetoothDeviceManager { 
            }

            @Override

            public void onGroupNodeRemoved(BluetoothDevice device, int groupId) {

                Log.i(this, (device == null ? "device is null" : device.getAddress())

                        + " group removed " + groupId);

                if (device == null || groupId == BluetoothLeAudio.GROUP_ID_INVALID) {

                    Log.w(this, "invalid parameter");

                    return;
@@ -88,7 +91,7 @@ public class BluetoothDeviceManager { 
            new BluetoothProfile.ServiceListener() {

                @Override

                public void onServiceConnected(int profile, BluetoothProfile proxy) {

                    Log.startSession("BMSL.oSC");

                    Log.startSession("BPSL.oSC");

                    try {

                        synchronized (mLock) {

                            String logString;
@@ -126,7 +129,7 @@ public class BluetoothDeviceManager { 


                @Override

                public void onServiceDisconnected(int profile) {

                    Log.startSession("BMSL.oSD");

                    Log.startSession("BPSL.oSD");

                    try {

                        synchronized (mLock) {

                            LinkedHashMap<String, BluetoothDevice> lostServiceDevices;