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

Commit 40e61c7a authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Android (Google) Code Review
Browse files

Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull"

parents 831b6844 5f8f3034

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8998,7 +8998,7 @@ package android.bluetooth.le { 
    method @Nullable public byte[] getManufacturerSpecificData(int);

    method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData();

    method @Nullable public byte[] getServiceData(android.os.ParcelUuid);

    method @Nullable public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();

    method @NonNull public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();

    method public java.util.List<android.os.ParcelUuid> getServiceUuids();

    method public int getTxPowerLevel();

  }

core/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) {