diff options
Diffstat (limited to 'framework/java/android/bluetooth/OobData.java')
| -rw-r--r-- | framework/java/android/bluetooth/OobData.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/framework/java/android/bluetooth/OobData.java b/framework/java/android/bluetooth/OobData.java index 2dfa91dcba..4e5ede74ce 100644 --- a/framework/java/android/bluetooth/OobData.java +++ b/framework/java/android/bluetooth/OobData.java @@ -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."); |