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

Commit 508506d8 authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

Update nullability checks to use Objects#requireNonNull 

instead of deprecated method in Preconditions class

Tag: #feature
Bug: 190767948
Test: Manual
Merged-In: Ie7f7282b89c13f587fdfe1bf3288eb4a3c7dcc6e
Change-Id: Ie7f7282b89c13f587fdfe1bf3288eb4a3c7dcc6e
parent 0a67fabe

framework/java/android/bluetooth/BluetoothAdapter.java

+6 −6
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


package android.bluetooth;



import static java.util.Objects.requireNonNull;



import android.Manifest;

import android.annotation.CallbackExecutor;

import android.annotation.IntDef;
@@ -53,8 +55,6 @@ import android.os.SystemProperties; 
import android.util.Log;

import android.util.Pair;



import com.android.internal.util.Preconditions;



import java.io.IOException;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -3091,8 +3091,8 @@ public final class BluetoothAdapter { 
         */

        WrappedOobDataCallback(@NonNull OobDataCallback callback,

                @NonNull @CallbackExecutor Executor executor) {

            Preconditions.checkNotNull(callback);

            Preconditions.checkNotNull(executor);

            requireNonNull(callback);

            requireNonNull(executor);

            mCallback = callback;

            mExecutor = executor;

        }
@@ -3158,7 +3158,7 @@ public final class BluetoothAdapter { 
                != BluetoothDevice.TRANSPORT_LE) {

            throw new IllegalArgumentException("Invalid transport '" + transport + "'!");

        }

        Preconditions.checkNotNull(callback);

        requireNonNull(callback);

        if (!isEnabled()) {

            Log.w(TAG, "generateLocalOobData(): Adapter isn't enabled!");

            callback.onError(OOB_ERROR_ADAPTER_DISABLED);
@@ -3293,7 +3293,7 @@ public final class BluetoothAdapter { 
     * @hide

     */

    public static boolean isAddressRandomStatic(@NonNull String address) {

        Preconditions.checkNotNull(address);

        requireNonNull(address);

        return checkBluetoothAddress(address)

                && (Integer.parseInt(address.split(":")[5], 16) & 0b11) == 0b11;

    }

framework/java/android/bluetooth/OobData.java

+13 −13
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.bluetooth;



import static java.util.Objects.requireNonNull;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -23,8 +25,6 @@ import android.annotation.SystemApi; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.util.Preconditions;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -214,7 +214,7 @@ public final class OobData implements Parcelable { 
        @NonNull

        @SystemApi

        public LeBuilder setDeviceName(@NonNull byte[] deviceName) {

            Preconditions.checkNotNull(deviceName);

            requireNonNull(deviceName);

            this.mDeviceName = deviceName;

            return this;

        }
@@ -308,8 +308,8 @@ public final class OobData implements Parcelable { 
        @SystemApi

        public LeBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] deviceAddressWithType,

                @LeRole int leDeviceRole) {

            Preconditions.checkNotNull(confirmationHash);

            Preconditions.checkNotNull(deviceAddressWithType);

            requireNonNull(confirmationHash);

            requireNonNull(deviceAddressWithType);

            if (confirmationHash.length != OobData.CONFIRMATION_OCTETS) {

                throw new IllegalArgumentException("confirmationHash must be "

                    + OobData.CONFIRMATION_OCTETS + " octets in length.");
@@ -344,7 +344,7 @@ public final class OobData implements Parcelable { 
        @NonNull

        @SystemApi

        public LeBuilder setLeTemporaryKey(@NonNull byte[] leTemporaryKey) {

            Preconditions.checkNotNull(leTemporaryKey);

            requireNonNull(leTemporaryKey);

            if (leTemporaryKey.length != LE_TK_OCTETS) {

                throw new IllegalArgumentException("leTemporaryKey must be "

                        + LE_TK_OCTETS + " octets in length.");
@@ -366,7 +366,7 @@ public final class OobData implements Parcelable { 
        @NonNull

        @SystemApi

        public LeBuilder setRandomizerHash(@NonNull byte[] randomizerHash) {

            Preconditions.checkNotNull(randomizerHash);

            requireNonNull(randomizerHash);

            if (randomizerHash.length != OobData.RANDOMIZER_OCTETS) {

                throw new IllegalArgumentException("randomizerHash must be "

                    + OobData.RANDOMIZER_OCTETS + " octets in length.");
@@ -534,9 +534,9 @@ public final class OobData implements Parcelable { 
        @SystemApi

        public ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength,

                @NonNull byte[] deviceAddressWithType) {

            Preconditions.checkNotNull(confirmationHash);

            Preconditions.checkNotNull(classicLength);

            Preconditions.checkNotNull(deviceAddressWithType);

            requireNonNull(confirmationHash);

            requireNonNull(classicLength);

            requireNonNull(deviceAddressWithType);

            if (confirmationHash.length != OobData.CONFIRMATION_OCTETS) {

                throw new IllegalArgumentException("confirmationHash must be "

                    + OobData.CONFIRMATION_OCTETS + " octets in length.");
@@ -567,7 +567,7 @@ public final class OobData implements Parcelable { 
        @NonNull

        @SystemApi

        public ClassicBuilder setRandomizerHash(@NonNull byte[] randomizerHash) {

            Preconditions.checkNotNull(randomizerHash);

            requireNonNull(randomizerHash);

            if (randomizerHash.length != OobData.RANDOMIZER_OCTETS) {

                throw new IllegalArgumentException("randomizerHash must be "

                    + OobData.RANDOMIZER_OCTETS + " octets in length.");
@@ -592,7 +592,7 @@ public final class OobData implements Parcelable { 
        @NonNull

        @SystemApi

        public ClassicBuilder setDeviceName(@NonNull byte[] deviceName) {

            Preconditions.checkNotNull(deviceName);

            requireNonNull(deviceName);

            this.mDeviceName = deviceName;

            return this;

        }
@@ -617,7 +617,7 @@ public final class OobData implements Parcelable { 
        @NonNull

        @SystemApi

        public ClassicBuilder setClassOfDevice(@NonNull byte[] classOfDevice) {

            Preconditions.checkNotNull(classOfDevice);

            requireNonNull(classOfDevice);

            if (classOfDevice.length != OobData.CLASS_OF_DEVICE_OCTETS) {

                throw new IllegalArgumentException("classOfDevice must be "

                        + OobData.CLASS_OF_DEVICE_OCTETS + " octets in length.");

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

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


package android.bluetooth.le;



import android.annotation.IntDef;

import static java.util.Objects.requireNonNull;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;
@@ -28,7 +29,6 @@ import android.os.ParcelUuid; 
import android.os.Parcelable;



import com.android.internal.util.BitUtils;

import com.android.internal.util.Preconditions;



import java.util.Arrays;

import java.util.List;
@@ -647,7 +647,7 @@ public final class ScanFilter implements Parcelable { 
        public Builder setDeviceAddress(@NonNull String deviceAddress,

                                        @AddressType int addressType,

                                        @NonNull byte[] irk) {

            Preconditions.checkNotNull(irk);

            requireNonNull(irk);

            if (irk.length != LEN_IRK_OCTETS) {

                throw new IllegalArgumentException("'irk' is invalid length!");

            }
@@ -679,7 +679,7 @@ public final class ScanFilter implements Parcelable { 
                                                 @Nullable byte[] irk) {



            // Make sure our deviceAddress is valid!

            Preconditions.checkNotNull(deviceAddress);

            requireNonNull(deviceAddress);

            if (!BluetoothAdapter.checkBluetoothAddress(deviceAddress)) {

                throw new IllegalArgumentException("invalid device address " + deviceAddress);

            }