Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af3819cf authored by Daulet Zhanguzin's avatar Daulet Zhanguzin Committed by Android (Google) Code Review
Browse files

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

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
parents 47361c2b 15d63e44

services/backup/java/com/android/server/backup/BackupManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java

+2 −2
Original line number Diff line number Diff line
@@ -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");

    }

services/backup/java/com/android/server/backup/UserBackupManagerService.java

+10 −10
Original line number Diff line number Diff line
@@ -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),

services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java

+2 −2
Original line number Diff line number Diff line
@@ -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");

    }

services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -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");

    }