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

Commit b3c9f77e authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Ignore ACTION_UUID intent when no uuids present" am: 5181a571 

am: 0b70c1e1

Change-Id: Ife45600307828c8e4bae766c437b6ed4dcc12ffc
parents b72e2bd0 0b70c1e1

android/app/src/com/android/bluetooth/btservice/PhonePolicy.java

+8 −5
Original line number Diff line number Diff line
@@ -137,12 +137,15 @@ class PhonePolicy { 
                                    .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

                    Parcelable[] uuids =

                            ((Intent) msg.obj).getParcelableArrayExtra(BluetoothDevice.EXTRA_UUID);



                    Log.d(TAG, "UUIDs on ACTION_UUID: " + uuids + " for device " + device);

                    if (uuids != null) {

                        ParcelUuid[] uuidsToSend = new ParcelUuid[uuids.length];

                        for (int i = 0; i < uuidsToSend.length; i++) {

                            uuidsToSend[i] = (ParcelUuid) uuids[i];

                        }



                        processInitProfilePriorities(device, uuidsToSend);

                    }

                } break;



                case MESSAGE_PROFILE_CONNECTION_STATE_CHANGED: {