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

Replace com.android.internal.util.Preconditions.checkNotNull with

Browse Source 
java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: I1634f81bd92d9a93ac8c8f39c218e8002cbaf497
This commit is contained in:
Daulet Zhanguzin
2019-12-30 16:09:29 +00:00
parent 7b36ffb06c
commit ce45b72770
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/companion/BluetoothLeDeviceFilter.java
View File

@@ -340,7 +340,7 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> {
public Builder setRawDataFilter(@NonNull byte[] rawDataFilter,
@Nullable byte[] rawDataFilterMask) {
checkNotUsed();
Preconditions.checkNotNull(rawDataFilter);
Objects.requireNonNull(rawDataFilter);
checkArgument(rawDataFilterMask == null ||
rawDataFilter.length == rawDataFilterMask.length,
"Mask and filter should be the same length");

14
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -16,9 +16,6 @@
package android.companion;
import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -42,6 +39,7 @@ import android.util.Log;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.BiConsumer;
/**
@@ -150,8 +148,8 @@ public final class CompanionDeviceManager {
if (!checkFeaturePresent()) {
return;
}
checkNotNull(request, "Request cannot be null");
checkNotNull(callback, "Callback cannot be null");
Objects.requireNonNull(request, "Request cannot be null");
Objects.requireNonNull(callback, "Callback cannot be null");
try {
mService.associate(
request,
@@ -278,9 +276,9 @@ public final class CompanionDeviceManager {
if (!checkFeaturePresent()) {
return false;
}
checkNotNull(packageName, "package name cannot be null");
checkNotNull(macAddress, "mac address cannot be null");
checkNotNull(user, "user cannot be null");
Objects.requireNonNull(packageName, "package name cannot be null");
Objects.requireNonNull(macAddress, "mac address cannot be null");
Objects.requireNonNull(user, "user cannot be null");
try {
return mService.isDeviceAssociated(
packageName, macAddress.toString(), user.getIdentifier());