Merge "Add FLAG_INCREMENTAL support to LocalTransport." into pi-dev (eed025c5) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/backup/LocalTransport.java

+39 −4

Original line number	Diff line number	Diff line
		@@ -187,11 +187,27 @@ public class LocalTransport extends BackupTransport {

		@Override
		public int performBackup(PackageInfo packageInfo, ParcelFileDescriptor data) {
		return performBackup(packageInfo, data, /flags=/ 0);
		}

		@Override
		public int performBackup(PackageInfo packageInfo, ParcelFileDescriptor data, int flags) {
		boolean isIncremental = (flags & FLAG_INCREMENTAL) != 0;
		boolean isNonIncremental = (flags & FLAG_NON_INCREMENTAL) != 0;

		if (isIncremental) {
		Log.i(TAG, "Performing incremental backup for " + packageInfo.packageName);
		} else if (isNonIncremental) {
		Log.i(TAG, "Performing non-incremental backup for " + packageInfo.packageName);
		} else {
		Log.i(TAG, "Performing backup for " + packageInfo.packageName);
		}

		if (DEBUG) {
		try {
		StructStat ss = Os.fstat(data.getFileDescriptor());
		Log.v(TAG, "performBackup() pkg=" + packageInfo.packageName
		+ " size=" + ss.st_size);
		+ " size=" + ss.st_size + " flags=" + flags);
		} catch (ErrnoException e) {
		Log.w(TAG, "Unable to stat input file in performBackup() on "
		+ packageInfo.packageName);
		@@ -199,7 +215,26 @@ public class LocalTransport extends BackupTransport {
		}

		File packageDir = new File(mCurrentSetIncrementalDir, packageInfo.packageName);
		boolean hasDataForPackage = !packageDir.mkdirs();

		if (isIncremental) {
		if (mParameters.isNonIncrementalOnly() \|\| !hasDataForPackage) {
		if (mParameters.isNonIncrementalOnly()) {
		Log.w(TAG, "Transport is in non-incremental only mode.");

		} else {
		Log.w(TAG,
		"Requested incremental, but transport currently stores no data for the "
		+ "package, requesting non-incremental retry.");
		}
		return TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED;
		}
		}
		if (isNonIncremental && hasDataForPackage) {
		Log.w(TAG, "Requested non-incremental, deleting existing data.");
		clearBackupData(packageInfo);
		packageDir.mkdirs();
		}

		// Each 'record' in the restore set is kept in its own file, named by
		// the record key. Wind through the data file, extracting individual

core/java/com/android/internal/backup/LocalTransportParameters.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,8 +26,10 @@ class LocalTransportParameters extends KeyValueSettingObserver {
		private static final String TAG = "LocalTransportParams";
		private static final String SETTING = Settings.Secure.BACKUP_LOCAL_TRANSPORT_PARAMETERS;
		private static final String KEY_FAKE_ENCRYPTION_FLAG = "fake_encryption_flag";
		private static final String KEY_NON_INCREMENTAL_ONLY = "non_incremental_only";

		private boolean mFakeEncryptionFlag;
		private boolean mIsNonIncrementalOnly;

		LocalTransportParameters(Handler handler, ContentResolver resolver) {
		super(handler, resolver, Settings.Secure.getUriFor(SETTING));
		@@ -37,11 +39,16 @@ class LocalTransportParameters extends KeyValueSettingObserver {
		return mFakeEncryptionFlag;
		}

		boolean isNonIncrementalOnly() {
		return mIsNonIncrementalOnly;
		}

		public String getSettingValue(ContentResolver resolver) {
		return Settings.Secure.getString(resolver, SETTING);
		}

		public void update(KeyValueListParser parser) {
		mFakeEncryptionFlag = parser.getBoolean(KEY_FAKE_ENCRYPTION_FLAG, false);
		mIsNonIncrementalOnly = parser.getBoolean(KEY_NON_INCREMENTAL_ONLY, false);
		}
		}