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

Commit d1e1c618 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5490630 from 49d863c89f4fca528d33fd0e3d098f4ef7dd408f to rvc-release 

Change-Id: Iaf70cc8c796afaa475b08526bdad7cba76876fd2
parents ed5ed9fb 0b9ab9b7

framework/java/android/bluetooth/le/ScanFilter.java

+6 −3
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.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;
@@ -586,7 +587,8 @@ public final class ScanFilter implements Parcelable { 
        /**

         * Set filter on service solicitation uuid.

         */

        public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid) {

        public @NonNull Builder setServiceSolicitationUuid(

                @Nullable ParcelUuid serviceSolicitationUuid) {

            mServiceSolicitationUuid = serviceSolicitationUuid;

            return this;

        }
@@ -601,8 +603,9 @@ public final class ScanFilter implements Parcelable { 
         * @throws IllegalArgumentException If {@code serviceSolicitationUuid} is {@code null} but

         *             {@code serviceSolicitationUuidMask} is not {@code null}.

         */

        public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid,

                ParcelUuid solicitationUuidMask) {

        public @NonNull Builder setServiceSolicitationUuid(

                @Nullable ParcelUuid serviceSolicitationUuid,

                @Nullable ParcelUuid solicitationUuidMask) {

            if (mServiceSolicitationUuidMask != null && mServiceSolicitationUuid == null) {

                throw new IllegalArgumentException(

                        "SolicitationUuid is null while SolicitationUuidMask is not null!");