Merge "Move more common methods to TarBackupReader." (1418d05a) · Commits · e / os / android_frameworks_base

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

+35 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,12 @@

		package com.android.server.backup;

		import android.app.backup.BackupAgent;
		import android.util.Slog;

		import java.text.SimpleDateFormat;
		import java.util.Date;

		/**
		* Description of a file in the restore datastream.
		*/
		@@ -46,4 +52,33 @@ public class FileMetadata {
		sb.append('}');
		return sb.toString();
		}

		public void dump() {
		StringBuilder b = new StringBuilder(128);

		// mode string
		b.append((type == BackupAgent.TYPE_DIRECTORY) ? 'd' : '-');
		b.append(((mode & 0400) != 0) ? 'r' : '-');
		b.append(((mode & 0200) != 0) ? 'w' : '-');
		b.append(((mode & 0100) != 0) ? 'x' : '-');
		b.append(((mode & 0040) != 0) ? 'r' : '-');
		b.append(((mode & 0020) != 0) ? 'w' : '-');
		b.append(((mode & 0010) != 0) ? 'x' : '-');
		b.append(((mode & 0004) != 0) ? 'r' : '-');
		b.append(((mode & 0002) != 0) ? 'w' : '-');
		b.append(((mode & 0001) != 0) ? 'x' : '-');
		b.append(String.format(" %9d ", size));

		Date stamp = new Date(mtime);
		b.append(new SimpleDateFormat("MMM dd HH:mm:ss ").format(stamp));

		b.append(packageName);
		b.append(" :: ");
		b.append(domain);
		b.append(" :: ");
		b.append(path);

		Slog.i(RefactoredBackupManagerService.TAG, b.toString());
		}

		}

+0 −32

Original line number	Diff line number	Diff line
		@@ -3654,38 +3654,6 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
		}
		}

		public Bundle putMonitoringExtra(Bundle extras, String key, String value) {
		if (extras == null) {
		extras = new Bundle();
		}
		extras.putString(key, value);
		return extras;
		}

		private Bundle putMonitoringExtra(Bundle extras, String key, int value) {
		if (extras == null) {
		extras = new Bundle();
		}
		extras.putInt(key, value);
		return extras;
		}

		public Bundle putMonitoringExtra(Bundle extras, String key, long value) {
		if (extras == null) {
		extras = new Bundle();
		}
		extras.putLong(key, value);
		return extras;
		}


		public Bundle putMonitoringExtra(Bundle extras, String key, boolean value) {
		if (extras == null) {
		extras = new Bundle();
		}
		extras.putBoolean(key, value);
		return extras;
		}

		@Override
		public IBackupManager getBackupManagerBinder() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -364,7 +364,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba
		BackupManagerMonitor.LOG_EVENT_ID_ERROR_PREFLIGHT,
		mCurrentPackage,
		BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY,
		backupManagerService.putMonitoringExtra(null,
		BackupManagerMonitorUtils.putMonitoringExtra(null,
		BackupManagerMonitor.EXTRA_LOG_PREFLIGHT_ERROR,
		preflightResult));
		backupPackageStatus = (int) preflightResult;
		@@ -545,7 +545,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba
		BackupManagerMonitor.LOG_EVENT_ID_EXCEPTION_FULL_BACKUP,
		mCurrentPackage,
		BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY,
		backupManagerService.putMonitoringExtra(null,
		BackupManagerMonitorUtils.putMonitoringExtra(null,
		BackupManagerMonitor.EXTRA_LOG_EXCEPTION_FULL_BACKUP,
		Log.getStackTraceString(e)));

+2 −2

Original line number	Diff line number	Diff line
		@@ -842,7 +842,7 @@ public class PerformBackupTask implements BackupRestoreTask {
		mCurrentPackage,
		BackupManagerMonitor
		.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY,
		backupManagerService.putMonitoringExtra(null,
		BackupManagerMonitorUtils.putMonitoringExtra(null,
		BackupManagerMonitor.EXTRA_LOG_ILLEGAL_KEY,
		key));
		backupManagerService.getBackupHandler().removeMessages(
		@@ -1027,7 +1027,7 @@ public class PerformBackupTask implements BackupRestoreTask {
		mMonitor = BackupManagerMonitorUtils.monitorEvent(mMonitor,
		BackupManagerMonitor.LOG_EVENT_ID_KEY_VALUE_BACKUP_CANCEL,
		mCurrentPackage, BackupManagerMonitor.LOG_EVENT_CATEGORY_AGENT,
		backupManagerService.putMonitoringExtra(null,
		BackupManagerMonitorUtils.putMonitoringExtra(null,
		BackupManagerMonitor.EXTRA_LOG_CANCEL_ALL,
		mCancelAll));
		errorCleanup();

+16 −397

File changed.

Preview size limit exceeded, changes collapsed.