diff --git a/apex/appsearch/framework/java/android/app/appsearch/AppSearchBatchResult.java b/apex/appsearch/framework/java/android/app/appsearch/AppSearchBatchResult.java index 35cea3e2a67b3..6c624264b9bec 100644 --- a/apex/appsearch/framework/java/android/app/appsearch/AppSearchBatchResult.java +++ b/apex/appsearch/framework/java/android/app/appsearch/AppSearchBatchResult.java @@ -26,6 +26,7 @@ import com.android.internal.util.Preconditions; import java.util.Collections; import java.util.Map; +import java.util.Objects; /** * Provides results for AppSearch batch operations which encompass multiple documents. @@ -180,7 +181,7 @@ public final class AppSearchBatchResult implements Parcelabl public Builder setSuccess( @NonNull KeyType key, @Nullable ValueType result) { Preconditions.checkState(!mBuilt, "Builder has already been used"); - Preconditions.checkNotNull(key); + Objects.requireNonNull(key); return setResult(key, AppSearchResult.newSuccessfulResult(result)); } @@ -198,7 +199,7 @@ public final class AppSearchBatchResult implements Parcelabl @AppSearchResult.ResultCode int resultCode, @Nullable String errorMessage) { Preconditions.checkState(!mBuilt, "Builder has already been used"); - Preconditions.checkNotNull(key); + Objects.requireNonNull(key); return setResult(key, AppSearchResult.newFailedResult(resultCode, errorMessage)); } @@ -214,8 +215,8 @@ public final class AppSearchBatchResult implements Parcelabl public Builder setResult( @NonNull KeyType key, @NonNull AppSearchResult result) { Preconditions.checkState(!mBuilt, "Builder has already been used"); - Preconditions.checkNotNull(key); - Preconditions.checkNotNull(result); + Objects.requireNonNull(key); + Objects.requireNonNull(result); if (result.isSuccess()) { mSuccesses.put(key, result.getResultValue()); mFailures.remove(key); diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java index 4ae16aa18305b..ba376273727d8 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java @@ -54,7 +54,6 @@ import android.util.Log; import android.util.Slog; import com.android.internal.annotations.GuardedBy; -import com.android.internal.util.Preconditions; import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.appsearch.external.localstorage.AppSearchImpl; @@ -181,10 +180,10 @@ public class AppSearchManagerService extends SystemService { int schemaVersion, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(schemaBundles); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(schemaBundles); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -230,9 +229,9 @@ public class AppSearchManagerService extends SystemService { @NonNull String databaseName, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -257,9 +256,9 @@ public class AppSearchManagerService extends SystemService { @NonNull String databaseName, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -285,10 +284,10 @@ public class AppSearchManagerService extends SystemService { @UserIdInt int userId, @ElapsedRealtimeLong long binderCallStartTimeMillis, @NonNull IAppSearchBatchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(documentBundles); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(documentBundles); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -359,11 +358,11 @@ public class AppSearchManagerService extends SystemService { @NonNull Map> typePropertyPaths, @UserIdInt int userId, @NonNull IAppSearchBatchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(namespace); - Preconditions.checkNotNull(uris); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(namespace); + Objects.requireNonNull(uris); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -404,11 +403,11 @@ public class AppSearchManagerService extends SystemService { @NonNull Bundle searchSpecBundle, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(queryExpression); - Preconditions.checkNotNull(searchSpecBundle); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(queryExpression); + Objects.requireNonNull(searchSpecBundle); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -439,10 +438,10 @@ public class AppSearchManagerService extends SystemService { @NonNull Bundle searchSpecBundle, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(queryExpression); - Preconditions.checkNotNull(searchSpecBundle); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(queryExpression); + Objects.requireNonNull(searchSpecBundle); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -471,7 +470,7 @@ public class AppSearchManagerService extends SystemService { long nextPageToken, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(callback); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); // TODO(b/162450968) check nextPageToken is being advanced by the same uid as originally @@ -644,10 +643,10 @@ public class AppSearchManagerService extends SystemService { @NonNull List uris, @UserIdInt int userId, @NonNull IAppSearchBatchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(uris); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(uris); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -684,11 +683,11 @@ public class AppSearchManagerService extends SystemService { @NonNull Bundle searchSpecBundle, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(queryExpression); - Preconditions.checkNotNull(searchSpecBundle); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(queryExpression); + Objects.requireNonNull(searchSpecBundle); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -717,9 +716,9 @@ public class AppSearchManagerService extends SystemService { @NonNull String databaseName, @UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(databaseName); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(packageName); + Objects.requireNonNull(databaseName); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -757,7 +756,7 @@ public class AppSearchManagerService extends SystemService { @Override public void initialize(@UserIdInt int userId, @NonNull IAppSearchResultCallback callback) { - Preconditions.checkNotNull(callback); + Objects.requireNonNull(callback); int callingUid = Binder.getCallingUid(); int callingUserId = handleIncomingUser(userId, callingUid); EXECUTOR.execute(() -> { @@ -788,7 +787,7 @@ public class AppSearchManagerService extends SystemService { } private void verifyCallingPackage(int callingUid, @NonNull String callingPackage) { - Preconditions.checkNotNull(callingPackage); + Objects.requireNonNull(callingPackage); if (mPackageManagerInternal.getPackageUid( callingPackage, /*flags=*/ 0, UserHandle.getUserId(callingUid)) != callingUid) { diff --git a/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java b/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java index c1b8294284671..4de52fb65d93a 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java @@ -35,7 +35,6 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; -import com.android.internal.util.Preconditions; import com.android.server.appsearch.external.localstorage.util.PrefixUtil; import java.util.ArrayList; @@ -43,6 +42,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -333,9 +333,9 @@ public class VisibilityStore { @NonNull Set schemasNotPlatformSurfaceable, @NonNull Map> schemasPackageAccessible) throws AppSearchException { - Preconditions.checkNotNull(prefix); - Preconditions.checkNotNull(schemasNotPlatformSurfaceable); - Preconditions.checkNotNull(schemasPackageAccessible); + Objects.requireNonNull(prefix); + Objects.requireNonNull(schemasNotPlatformSurfaceable); + Objects.requireNonNull(schemasPackageAccessible); // Persist the document GenericDocument.Builder visibilityDocument = @@ -383,8 +383,8 @@ public class VisibilityStore { /** Checks whether {@code prefixedSchema} can be searched over by the {@code callerUid}. */ public boolean isSchemaSearchableByCaller( @NonNull String prefix, @NonNull String prefixedSchema, int callerUid) { - Preconditions.checkNotNull(prefix); - Preconditions.checkNotNull(prefixedSchema); + Objects.requireNonNull(prefix); + Objects.requireNonNull(prefixedSchema); // We compare appIds here rather than direct uids because the package's uid may change based // on the user that's running. diff --git a/apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java b/apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java index 1c04d99ac2c74..731ab35bf367c 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java @@ -29,7 +29,6 @@ import android.util.SparseIntArray; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.util.Preconditions; import com.android.server.appsearch.external.localstorage.AppSearchLogger; import com.android.server.appsearch.external.localstorage.stats.CallStats; import com.android.server.appsearch.external.localstorage.stats.PutDocumentStats; @@ -38,6 +37,7 @@ import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Map; +import java.util.Objects; import java.util.Random; /** @@ -162,15 +162,15 @@ public final class PlatformLogger implements AppSearchLogger { * Westworld constructor */ public PlatformLogger(@NonNull Context context, int userId, @NonNull Config config) { - mContext = Preconditions.checkNotNull(context); - mConfig = Preconditions.checkNotNull(config); + mContext = Objects.requireNonNull(context); + mConfig = Objects.requireNonNull(config); mUserId = userId; } /** Logs {@link CallStats}. */ @Override public void logStats(@NonNull CallStats stats) { - Preconditions.checkNotNull(stats); + Objects.requireNonNull(stats); synchronized (mLock) { if (shouldLogForTypeLocked(stats.getCallType())) { logStatsImplLocked(stats); @@ -181,7 +181,7 @@ public final class PlatformLogger implements AppSearchLogger { /** Logs {@link PutDocumentStats}. */ @Override public void logStats(@NonNull PutDocumentStats stats) { - Preconditions.checkNotNull(stats); + Objects.requireNonNull(stats); synchronized (mLock) { if (shouldLogForTypeLocked(CallStats.CALL_TYPE_PUT_DOCUMENT)) { logStatsImplLocked(stats); @@ -197,7 +197,7 @@ public final class PlatformLogger implements AppSearchLogger { */ public int removeCachedUidForPackage(@NonNull String packageName) { // TODO(b/173532925) This needs to be called when we get PACKAGE_REMOVED intent - Preconditions.checkNotNull(packageName); + Objects.requireNonNull(packageName); synchronized (mLock) { Integer uid = mPackageUidCacheLocked.remove(packageName); return uid != null ? uid : Process.INVALID_UID; diff --git a/apex/appsearch/testing/java/com/android/server/appsearch/testing/AppSearchSessionShimImpl.java b/apex/appsearch/testing/java/com/android/server/appsearch/testing/AppSearchSessionShimImpl.java index f0de4962ad3ca..61933672a1e1c 100644 --- a/apex/appsearch/testing/java/com/android/server/appsearch/testing/AppSearchSessionShimImpl.java +++ b/apex/appsearch/testing/java/com/android/server/appsearch/testing/AppSearchSessionShimImpl.java @@ -40,11 +40,11 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -81,8 +81,8 @@ public class AppSearchSessionShimImpl implements AppSearchSessionShim { private AppSearchSessionShimImpl( @NonNull AppSearchSession session, @NonNull ExecutorService executor) { - mAppSearchSession = Preconditions.checkNotNull(session); - mExecutor = Preconditions.checkNotNull(executor); + mAppSearchSession = Objects.requireNonNull(session); + mExecutor = Objects.requireNonNull(executor); } @Override diff --git a/apex/appsearch/testing/java/com/android/server/appsearch/testing/GlobalSearchSessionShimImpl.java b/apex/appsearch/testing/java/com/android/server/appsearch/testing/GlobalSearchSessionShimImpl.java index 5042ce0efbd82..c35849d23c26b 100644 --- a/apex/appsearch/testing/java/com/android/server/appsearch/testing/GlobalSearchSessionShimImpl.java +++ b/apex/appsearch/testing/java/com/android/server/appsearch/testing/GlobalSearchSessionShimImpl.java @@ -30,11 +30,11 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; +import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -69,8 +69,8 @@ public class GlobalSearchSessionShimImpl implements GlobalSearchSessionShim { private GlobalSearchSessionShimImpl( @NonNull GlobalSearchSession session, @NonNull ExecutorService executor) { - mGlobalSearchSession = Preconditions.checkNotNull(session); - mExecutor = Preconditions.checkNotNull(executor); + mGlobalSearchSession = Objects.requireNonNull(session); + mExecutor = Objects.requireNonNull(executor); } @NonNull diff --git a/apex/appsearch/testing/java/com/android/server/appsearch/testing/SearchResultsShimImpl.java b/apex/appsearch/testing/java/com/android/server/appsearch/testing/SearchResultsShimImpl.java index 5f26e8cba5851..72078f855d706 100644 --- a/apex/appsearch/testing/java/com/android/server/appsearch/testing/SearchResultsShimImpl.java +++ b/apex/appsearch/testing/java/com/android/server/appsearch/testing/SearchResultsShimImpl.java @@ -22,12 +22,12 @@ import android.app.appsearch.SearchResult; import android.app.appsearch.SearchResults; import android.app.appsearch.SearchResultsShim; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import java.util.List; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -40,8 +40,8 @@ public class SearchResultsShimImpl implements SearchResultsShim { private final SearchResults mSearchResults; SearchResultsShimImpl(@NonNull SearchResults searchResults, @NonNull Executor executor) { - mExecutor = Preconditions.checkNotNull(executor); - mSearchResults = Preconditions.checkNotNull(searchResults); + mExecutor = Objects.requireNonNull(executor); + mSearchResults = Objects.requireNonNull(searchResults); } @NonNull