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

Merge "Remove duplicate code in initializing transports"

Browse Source
This commit is contained in:
Chandan Nath
2019-12-30 09:53:48 +00:00
committed by Android (Google) Code Review
parent 70c19b4023 84c99f332e
commit c718631205
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

@@ -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));

15
services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java
View File

@@ -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);
}
}
}

3
services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java
View File

@@ -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;