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

Commit c7186312 authored by Chandan Nath's avatar Chandan Nath Committed by Android (Google) Code Review
Browse files

Merge "Remove duplicate code in initializing transports"

parents 70c19b40 84c99f33

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

+1 −1
Original line number Diff line number Diff line
@@ -2409,7 +2409,7 @@ public class UserBackupManagerService { 


    /** Run an initialize operation for the given transport. */

    public void initializeTransports(String[] transportNames, IBackupObserver observer) {

        mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,

                "initializeTransport");

        Slog.v(TAG, "initializeTransport(): " + Arrays.asList(transportNames));

services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java

+1 −14
Original line number Diff line number Diff line
@@ -53,21 +53,8 @@ public class RunInitializeReceiver extends BroadcastReceiver { 


            if (pendingInits.size() > 0) {

                String[] transports = pendingInits.toArray(new String[pendingInits.size()]);



                mUserBackupManagerService.clearPendingInits();



                UserBackupManagerService.BackupWakeLock wakelock =

                        mUserBackupManagerService.getWakelock();

                wakelock.acquire();

                OnTaskFinishedListener listener = caller -> wakelock.release();



                Runnable task =

                        new PerformInitializeTask(

                                mUserBackupManagerService,

                                transports,

                                /* observer */ null,

                                listener);

                mUserBackupManagerService.getBackupHandler().post(task);

                mUserBackupManagerService.initializeTransports(transports, null);

            }

        }

    }

services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java

+0 −3
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import com.android.server.backup.BackupAgentTimeoutParameters; 
import com.android.server.backup.BackupRestoreTask;

import com.android.server.backup.DataChangedJournal;

import com.android.server.backup.KeyValueBackupJob;

import com.android.server.backup.TransportManager;

import com.android.server.backup.UserBackupManagerService;

import com.android.server.backup.fullbackup.PerformFullTransportBackupTask;

import com.android.server.backup.internal.OnTaskFinishedListener;
@@ -233,7 +232,6 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { 


    private final UserBackupManagerService mBackupManagerService;

    private final PackageManager mPackageManager;

    private final TransportManager mTransportManager;

    private final TransportClient mTransportClient;

    private final BackupAgentTimeoutParameters mAgentTimeoutParameters;

    private final KeyValueBackupReporter mReporter;
@@ -300,7 +298,6 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { 
            boolean userInitiated,

            boolean nonIncremental) {

        mBackupManagerService = backupManagerService;

        mTransportManager = backupManagerService.getTransportManager();

        mPackageManager = backupManagerService.getPackageManager();

        mTransportClient = transportClient;

        mOriginalQueue = queue;