Merge "[FSD2D] Remove left-over code from proof-of-concept" into sc-dev (a10dc432) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -4335,18 +4335,11 @@ public final class ActivityThread extends ClientTransactionHandler

		private String getBackupAgentName(CreateBackupAgentData data) {
		String agentName = data.appInfo.backupAgentName;
		if (!UserHandle.isCore(data.appInfo.uid)
		&& data.operationType == BackupManager.OperationType.MIGRATION) {
		// If this is a migration, use the default backup agent regardless of the app's
		// preferences.
		agentName = DEFAULT_FULL_BACKUP_AGENT;
		} else {
		// full backup operation but no app-supplied agent? use the default implementation
		if (agentName == null && (data.backupMode == ApplicationThreadConstants.BACKUP_MODE_FULL
		\|\| data.backupMode == ApplicationThreadConstants.BACKUP_MODE_RESTORE_FULL)) {
		agentName = DEFAULT_FULL_BACKUP_AGENT;
		}
		}
		return agentName;
		}

+0 −14

Original line number	Diff line number	Diff line
		@@ -544,11 +544,6 @@ public abstract class BackupAgent extends ContextWrapper {
		}

		private Set<String> getExtraExcludeDirsIfAny(Context context) throws IOException {
		if (isDeviceToDeviceMigration()) {
		return Collections.emptySet();
		}

		// If this is not a migration, also exclude no-backup and cache dirs.
		Set<String> excludedDirs = new HashSet<>();
		excludedDirs.add(context.getCacheDir().getCanonicalPath());
		excludedDirs.add(context.getCodeCacheDir().getCanonicalPath());
		@@ -556,10 +551,6 @@ public abstract class BackupAgent extends ContextWrapper {
		return Collections.unmodifiableSet(excludedDirs);
		}

		private boolean isDeviceToDeviceMigration() {
		return mOperationType == OperationType.MIGRATION;
		}

		/** @hide */
		@VisibleForTesting
		public IncludeExcludeRules getIncludeExcludeRules(FullBackup.BackupScheme backupScheme)
		@@ -905,11 +896,6 @@ public abstract class BackupAgent extends ContextWrapper {
		}

		private boolean isFileEligibleForRestore(File destination) throws IOException {
		if (isDeviceToDeviceMigration()) {
		// Everything is eligible for device-to-device migration.
		return true;
		}

		FullBackup.BackupScheme bs = FullBackup.getBackupScheme(this, mOperationType);
		if (!bs.isFullRestoreEnabled()) {
		if (Log.isLoggable(FullBackup.TAG_XML_PARSER, Log.VERBOSE)) {