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

Commit 981b51f1 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" am: da2b966f6e 

am: b64a3ad7

Change-Id: I1f7be9f652f003052d520199cae167910d8f54ce
parents dd3e54cd b64a3ad7

framework/java/android/bluetooth/le/ScanRecord.java

+2 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth.le;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.bluetooth.BluetoothUuid;
@@ -97,7 +98,7 @@ public final class ScanRecord { 
     * Returns a list of service solicitation UUIDs within the advertisement that are used to

     * identify the Bluetooth GATT services.

     */

    @Nullable

    @NonNull

    public List<ParcelUuid> getServiceSolicitationUuids() {

        return mServiceSolicitationUuids;

    }
@@ -297,9 +298,6 @@ public final class ScanRecord { 
            if (serviceUuids.isEmpty()) {

                serviceUuids = null;

            }

            if (serviceSolicitationUuids.isEmpty()) {

                serviceSolicitationUuids = null;

            }

            return new ScanRecord(serviceUuids, serviceSolicitationUuids, manufacturerData,

                    serviceData, advertiseFlag, txPowerLevel, localName, scanRecord);

        } catch (Exception e) {