diff options
3 files changed, 8 insertions, 6 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index f9213aabe272..622b84239711 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2877,7 +2877,7 @@ public class BackupManagerService implements BackupManagerServiceInterface { // The backend reports that our dataset has been wiped. Note this in // the event log; the no-success code below will reset the backup // state as well. - EventLog.writeEvent(EventLogTags.BACKUP_RESET, mTransport.transportDirName()); + EventLog.writeEvent(EventLogTags.BACKUP_RESET, transportName); } } catch (Exception e) { Slog.e(TAG, "Error in backup thread", e); @@ -9781,7 +9781,8 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF } Slog.i(TAG, "Initializing (wiping) backup transport storage: " + transportName); - EventLog.writeEvent(EventLogTags.BACKUP_START, transport.transportDirName()); + String transportDirName = transport.transportDirName(); + EventLog.writeEvent(EventLogTags.BACKUP_START, transportDirName); long startRealtime = SystemClock.elapsedRealtime(); int status = transport.initializeDevice(); @@ -9794,7 +9795,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF Slog.i(TAG, "Device init successful"); int millis = (int) (SystemClock.elapsedRealtime() - startRealtime); EventLog.writeEvent(EventLogTags.BACKUP_INITIALIZE); - resetBackupState(new File(mBaseStateDir, transport.transportDirName())); + resetBackupState(new File(mBaseStateDir, transportDirName)); EventLog.writeEvent(EventLogTags.BACKUP_SUCCESS, 0, millis); synchronized (mQueueLock) { recordInitPendingLocked(false, transportName); diff --git a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java index 7a8a920e7df7..c0caa557b4ae 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java @@ -339,7 +339,7 @@ public class PerformBackupTask implements BackupRestoreTask { // The backend reports that our dataset has been wiped. Note this in // the event log; the no-success code below will reset the backup // state as well. - EventLog.writeEvent(EventLogTags.BACKUP_RESET, mTransport.transportDirName()); + EventLog.writeEvent(EventLogTags.BACKUP_RESET, transportName); } } catch (Exception e) { Slog.e(TAG, "Error in backup thread", e); diff --git a/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java b/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java index 939b1ae11b95..690922fd9aa9 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java @@ -79,7 +79,8 @@ public class PerformInitializeTask implements Runnable { } Slog.i(TAG, "Initializing (wiping) backup transport storage: " + transportName); - EventLog.writeEvent(EventLogTags.BACKUP_START, transport.transportDirName()); + String transportDirName = transport.transportDirName(); + EventLog.writeEvent(EventLogTags.BACKUP_START, transportDirName); long startRealtime = SystemClock.elapsedRealtime(); int status = transport.initializeDevice(); @@ -94,7 +95,7 @@ public class PerformInitializeTask implements Runnable { EventLog.writeEvent(EventLogTags.BACKUP_INITIALIZE); backupManagerService .resetBackupState(new File(backupManagerService.getBaseStateDir(), - transport.transportDirName())); + transportDirName)); EventLog.writeEvent(EventLogTags.BACKUP_SUCCESS, 0, millis); synchronized (backupManagerService.getQueueLock()) { backupManagerService.recordInitPendingLocked(false, transportName); |