Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update nullability checks to use Objects#requireNonNull

Browse Source 
instead of deprecated method in Preconditions class

Tag: #feature
Bug: 190767948
Test: Manual
Change-Id: Ie7f7282b89c13f587fdfe1bf3288eb4a3c7dcc6e
This commit is contained in:
Rahul Sabnis
2021-06-10 17:28:38 -07:00
parent 7adad678e0
commit 710f462a5f
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -17,6 +17,8 @@
package android.bluetooth;
import static java.util.Objects.requireNonNull;
import android.annotation.CallbackExecutor;
import android.annotation.IntDef;
import android.annotation.NonNull;
@@ -62,8 +64,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;
@@ -3314,8 +3314,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;
}
@@ -3385,7 +3385,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(BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED);
@@ -3522,7 +3522,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;
}

26
core/java/android/bluetooth/OobData.java
View File

@@ -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.");

7
core/java/android/bluetooth/le/ScanFilter.java
View File

@@ -16,6 +16,8 @@
package android.bluetooth.le;
import static java.util.Objects.requireNonNull;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -27,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;
@@ -646,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!");
}
@@ -678,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);
}