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

Commit b1072538 authored by Gopi Sakshihally Bhuthaiah (xWF)'s avatar Gopi Sakshihally Bhuthaiah (xWF) Committed by Automerger Merge Worker
Browse files

Merge "java.lang.ClassCastException fix" into main am: 11e3087a 

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



Change-Id: I0a3529bd52791e13414ab22ea75190878fad6b95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adfab7d5 11e3087a

framework/tests/bumble/src/android/bluetooth/service_discovery/ServiceDiscoveryTest.java

+25 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.os.ParcelUuid;

import android.os.Parcelable;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;
@@ -115,10 +116,32 @@ public class ServiceDiscoveryTest { 
                            Intent intent = inv.getArgument(1);

                            String action = intent.getAction();

                            if (BluetoothDevice.ACTION_UUID.equals(action)) {

                                ParcelUuid[] uuids =

                                BluetoothDevice device =

                                        intent.getParcelableExtra(

                                                BluetoothDevice.EXTRA_DEVICE,

                                                BluetoothDevice.class);

                                Parcelable[] uuidsRaw =

                                        intent.getParcelableArrayExtra(

                                                BluetoothDevice.EXTRA_UUID, ParcelUuid.class);

                                Log.d(TAG, "onReceive(): UUID=" + Arrays.toString(uuids));

                                if (uuidsRaw == null) {

                                    Log.e(TAG, "onReceive(): device " + device + " null uuid list");

                                } else if (uuidsRaw.length == 0) {

                                    Log.e(

                                            TAG,

                                            "onReceive(): device "

                                                    + device

                                                    + " 0 length uuid list");

                                } else {

                                    ParcelUuid[] uuids =

                                            Arrays.copyOf(

                                                    uuidsRaw, uuidsRaw.length, ParcelUuid[].class);

                                    Log.d(

                                            TAG,

                                            "onReceive(): device "

                                                    + device

                                                    + ", UUID="

                                                    + Arrays.toString(uuids));

                                }

                            }

                            return null;

                        })