diff options
11 files changed, 29 insertions, 30 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 3651a4143953..3bce322a7655 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -16,8 +16,6 @@ package com.android.server.backup; -import static com.android.internal.util.Preconditions.checkNotNull; - import static java.util.Collections.emptySet; import android.Manifest; @@ -68,6 +66,7 @@ import java.io.FileDescriptor; import java.io.IOException; import java.io.PrintWriter; import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -124,7 +123,7 @@ public class BackupManagerService extends IBackupManager.Stub { static BackupManagerService sInstance; static BackupManagerService getInstance() { - return checkNotNull(sInstance); + return Objects.requireNonNull(sInstance); } private final Context mContext; diff --git a/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java b/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java index 92c2ee4c4e71..c9b09e31f94b 100644 --- a/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java +++ b/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java @@ -21,7 +21,6 @@ import android.os.RemoteException; import android.os.SELinux; import android.util.Slog; -import com.android.internal.util.Preconditions; import com.android.server.backup.fullbackup.AppMetadataBackupWriter; import com.android.server.backup.remote.ServiceBackupCallback; import com.android.server.backup.utils.FullBackupUtils; @@ -33,6 +32,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.util.Objects; /** * Used by BackupManagerService to perform adb backup for key-value packages. At the moment this @@ -87,7 +87,7 @@ public class KeyValueAdbBackupEngine { pkg + BACKUP_KEY_VALUE_NEW_STATE_FILENAME_SUFFIX); mManifestFile = new File(mDataDir, BACKUP_MANIFEST_FILENAME); - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); } diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index 2799f122038c..064cd060528d 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -18,7 +18,6 @@ package com.android.server.backup; import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_BACKUP_IN_FOREGROUND; -import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.server.backup.BackupManagerService.DEBUG; import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING; import static com.android.server.backup.BackupManagerService.MORE_DEBUG; @@ -159,6 +158,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Queue; import java.util.Random; import java.util.Set; @@ -518,7 +518,7 @@ public class UserBackupManagerService { File dataDir, TransportManager transportManager) { mUserId = userId; - mContext = checkNotNull(context, "context cannot be null"); + mContext = Objects.requireNonNull(context, "context cannot be null"); mPackageManager = context.getPackageManager(); mPackageManagerBinder = AppGlobals.getPackageManager(); mActivityManager = ActivityManager.getService(); @@ -528,14 +528,14 @@ public class UserBackupManagerService { mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); mStorageManager = IStorageManager.Stub.asInterface(ServiceManager.getService("mount")); - checkNotNull(parent, "parent cannot be null"); + Objects.requireNonNull(parent, "parent cannot be null"); mBackupManagerBinder = BackupManagerService.asInterface(parent.asBinder()); mAgentTimeoutParameters = new BackupAgentTimeoutParameters(Handler.getMain(), mContext.getContentResolver()); mAgentTimeoutParameters.start(); - checkNotNull(userBackupThread, "userBackupThread cannot be null"); + Objects.requireNonNull(userBackupThread, "userBackupThread cannot be null"); mBackupHandler = new BackupHandler(this, userBackupThread); // Set up our bookkeeping @@ -551,7 +551,7 @@ public class UserBackupManagerService { mSetupObserver, mUserId); - mBaseStateDir = checkNotNull(baseStateDir, "baseStateDir cannot be null"); + mBaseStateDir = Objects.requireNonNull(baseStateDir, "baseStateDir cannot be null"); // TODO (b/120424138): Remove once the system user is migrated to use the per-user CE // directory. Per-user CE directories are managed by vold. if (userId == UserHandle.USER_SYSTEM) { @@ -563,7 +563,7 @@ public class UserBackupManagerService { // TODO (b/120424138): The system user currently uses the cache which is managed by init.rc // Initialization and restorecon is managed by vold for per-user CE directories. - mDataDir = checkNotNull(dataDir, "dataDir cannot be null"); + mDataDir = Objects.requireNonNull(dataDir, "dataDir cannot be null"); mBackupPasswordManager = new BackupPasswordManager(mContext, mBaseStateDir, mRng); // Receivers for scheduled backups and transport initialization operations. @@ -625,7 +625,7 @@ public class UserBackupManagerService { addPackageParticipantsLocked(null); } - mTransportManager = checkNotNull(transportManager, "transportManager cannot be null"); + mTransportManager = Objects.requireNonNull(transportManager, "transportManager cannot be null"); mTransportManager.setOnTransportRegisteredListener(this::onTransportRegistered); mRegisterTransportsRequestedTime = SystemClock.elapsedRealtime(); mBackupHandler.postDelayed( @@ -3047,9 +3047,9 @@ public class UserBackupManagerService { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "updateTransportAttributes"); - Preconditions.checkNotNull(transportComponent, "transportComponent can't be null"); - Preconditions.checkNotNull(name, "name can't be null"); - Preconditions.checkNotNull( + Objects.requireNonNull(transportComponent, "transportComponent can't be null"); + Objects.requireNonNull(name, "name can't be null"); + Objects.requireNonNull( currentDestinationString, "currentDestinationString can't be null"); Preconditions.checkArgument( (dataManagementIntent == null) == (dataManagementLabel == null), diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java index 7ea1892727e3..846c6a23d394 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java +++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java @@ -36,7 +36,6 @@ import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.Slog; -import com.android.internal.util.Preconditions; import com.android.server.AppWidgetBackupBridge; import com.android.server.backup.BackupAgentTimeoutParameters; import com.android.server.backup.BackupRestoreTask; @@ -47,6 +46,7 @@ import com.android.server.backup.utils.FullBackupUtils; import java.io.File; import java.io.IOException; import java.io.OutputStream; +import java.util.Objects; /** * Core logic for performing one package's full backup, gathering the tarball from the application @@ -201,7 +201,7 @@ public class FullBackupEngine { mOpToken = opToken; mTransportFlags = transportFlags; mAgentTimeoutParameters = - Preconditions.checkNotNull( + Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); } diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java index e14253702d55..aaf1f0a65dc8 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java +++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java @@ -32,13 +32,13 @@ import android.os.UserHandle; import android.util.Slog; import com.android.internal.backup.IObbBackupService; -import com.android.internal.util.Preconditions; import com.android.server.backup.BackupAgentTimeoutParameters; import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.utils.FullBackupUtils; import java.io.IOException; import java.io.OutputStream; +import java.util.Objects; /** * Full backup/restore to a file/socket. @@ -52,7 +52,7 @@ public class FullBackupObbConnection implements ServiceConnection { public FullBackupObbConnection(UserBackupManagerService backupManagerService) { this.backupManagerService = backupManagerService; mService = null; - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); } diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index 18c38dc9efdb..f7f01387cf78 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -42,7 +42,6 @@ import android.util.Log; import android.util.Slog; import com.android.internal.backup.IBackupTransport; -import com.android.internal.util.Preconditions; import com.android.server.EventLogTags; import com.android.server.backup.BackupAgentTimeoutParameters; import com.android.server.backup.BackupRestoreTask; @@ -62,6 +61,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -171,7 +171,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba mUserInitiated = userInitiated; mCurrentOpToken = backupManagerService.generateRandomIntegerToken(); mBackupRunnerOpToken = backupManagerService.generateRandomIntegerToken(); - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); mUserId = backupManagerService.getUserId(); diff --git a/services/backup/java/com/android/server/backup/internal/BackupHandler.java b/services/backup/java/com/android/server/backup/internal/BackupHandler.java index 8c48b8455da4..0964b3194e60 100644 --- a/services/backup/java/com/android/server/backup/internal/BackupHandler.java +++ b/services/backup/java/com/android/server/backup/internal/BackupHandler.java @@ -32,7 +32,6 @@ import android.util.Pair; import android.util.Slog; import com.android.internal.backup.IBackupTransport; -import com.android.internal.util.Preconditions; import com.android.server.EventLogTags; import com.android.server.backup.BackupAgentTimeoutParameters; import com.android.server.backup.BackupRestoreTask; @@ -58,6 +57,7 @@ import com.android.server.backup.transport.TransportClient; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; /** * Asynchronous backup/restore handler thread. @@ -98,7 +98,7 @@ public class BackupHandler extends Handler { super(backupThread.getLooper()); mBackupThread = backupThread; this.backupManagerService = backupManagerService; - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); } diff --git a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java index 94921186441a..bda0e3bb39fc 100644 --- a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java +++ b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java @@ -310,7 +310,7 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { mUserInitiated = userInitiated; mNonIncremental = nonIncremental; mAgentTimeoutParameters = - Preconditions.checkNotNull( + Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); mStateDirectory = new File(backupManagerService.getBaseStateDir(), transportDirName); diff --git a/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java b/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java index e4890e009abb..376b618935c5 100644 --- a/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java +++ b/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java @@ -21,11 +21,11 @@ import static com.android.server.backup.BackupManagerService.MORE_DEBUG; import android.util.Slog; -import com.android.internal.util.Preconditions; import com.android.server.backup.BackupAgentTimeoutParameters; import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.UserBackupManagerService; +import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -45,7 +45,7 @@ public class AdbRestoreFinishedLatch implements BackupRestoreTask { this.backupManagerService = backupManagerService; mLatch = new CountDownLatch(1); mCurrentOpToken = currentOpToken; - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); } diff --git a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java index eba9e4aa4c28..82bed3b57f16 100644 --- a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java +++ b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java @@ -42,7 +42,6 @@ import android.text.TextUtils; 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.backup.BackupAgentTimeoutParameters; import com.android.server.backup.BackupRestoreTask; @@ -62,6 +61,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Objects; /** * Full restore engine, used by both adb restore and transport-based full restore. @@ -142,7 +142,7 @@ public class FullRestoreEngine extends RestoreEngine { mOnlyPackage = onlyPackage; mAllowApks = allowApks; mBuffer = new byte[32 * 1024]; - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); mIsAdbRestore = isAdbRestore; diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index de6a080f1330..16484df9f328 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -54,7 +54,6 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.backup.IBackupTransport; -import com.android.internal.util.Preconditions; import com.android.server.AppWidgetBackupBridge; import com.android.server.EventLogTags; import com.android.server.LocalServices; @@ -79,6 +78,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; public class PerformUnifiedRestoreTask implements BackupRestoreTask { @@ -208,7 +208,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { mFinished = false; mDidLaunch = false; mListener = listener; - mAgentTimeoutParameters = Preconditions.checkNotNull( + mAgentTimeoutParameters = Objects.requireNonNull( backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); |