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

Commit dd2b92d9 authored by Zach Johnson's avatar Zach Johnson Committed by android-build-merger
Browse files

Merge "Add nullability annotations to android.bluetooth.le.ScanFilter.Builder... 

Merge "Add nullability annotations to android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid"
am: ce5fdc04

Change-Id: Ib08fcd957f2eb162d9021d4b7a9ef7dcda5be646
parents 4f305a99 ce5fdc04

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -8734,8 +8734,8 @@ package android.bluetooth.le { 
    method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);

    method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);

    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]);

    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]);

    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]);

    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]);

    method public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(android.os.ParcelUuid);

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(@Nullable android.os.ParcelUuid);

    method public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(android.os.ParcelUuid, android.os.ParcelUuid);

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(@Nullable android.os.ParcelUuid, @Nullable android.os.ParcelUuid);

    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);

    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);

    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);

    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);

  }

  }

core/java/android/bluetooth/le/ScanFilter.java

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




package android.bluetooth.le;

package android.bluetooth.le;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

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

        /**

         * Set filter on service solicitation uuid.

         * Set filter on service solicitation uuid.

         */

         */

        public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid) {

        public @NonNull Builder setServiceSolicitationUuid(

                @Nullable ParcelUuid serviceSolicitationUuid) {

            mServiceSolicitationUuid = serviceSolicitationUuid;

            mServiceSolicitationUuid = serviceSolicitationUuid;

            return this;

            return this;

        }

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

         * @throws IllegalArgumentException If {@code serviceSolicitationUuid} is {@code null} but

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

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

         */

         */

        public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid,

        public @NonNull Builder setServiceSolicitationUuid(

                ParcelUuid solicitationUuidMask) {

                @Nullable ParcelUuid serviceSolicitationUuid,

                @Nullable ParcelUuid solicitationUuidMask) {

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

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

                throw new IllegalArgumentException(

                throw new IllegalArgumentException(

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

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