Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 806f807d authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Use correct backup mode for k/v restore" into udc-dev am: e4ca364c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22166499



Change-Id: I6c6664d012c9b27bddd6aa5ba491af47b6ad05a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60523247 e4ca364c

services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ public class FullRestoreEngine extends RestoreEngine { 
                            setUpPipes();

                            mAgent = mBackupManagerService.bindToAgentSynchronous(mTargetApp,

                                    FullBackup.KEY_VALUE_DATA_TOKEN.equals(info.domain)

                                            ? ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL

                                            ? ApplicationThreadConstants.BACKUP_MODE_RESTORE

                                            : ApplicationThreadConstants.BACKUP_MODE_RESTORE_FULL,

                                    mBackupEligibilityRules.getBackupDestination());

                            mAgentPackage = pkg;

services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { 
        // Good to go!  Set up and bind the agent...

        mAgent = backupManagerService.bindToAgentSynchronous(

                mCurrentPackage.applicationInfo,

                ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL,

                ApplicationThreadConstants.BACKUP_MODE_RESTORE,

                mBackupEligibilityRules.getBackupDestination());

        if (mAgent == null) {

            Slog.w(TAG, "Can't find backup agent for " + packageName);

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -4603,8 +4603,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            boolean isRestrictedBackupMode = false;

            if (backupTarget != null && backupTarget.appInfo.packageName.equals(processName)) {

                isRestrictedBackupMode = backupTarget.appInfo.uid >= FIRST_APPLICATION_UID

                        && ((backupTarget.backupMode == BackupRecord.RESTORE)

                                || (backupTarget.backupMode == BackupRecord.RESTORE_FULL)

                        && ((backupTarget.backupMode == BackupRecord.RESTORE_FULL)

                                || (backupTarget.backupMode == BackupRecord.BACKUP_FULL));

            }










@@ -13394,7 +13393,8 @@ public class ActivityManagerService extends IActivityManager.Stub



























            BackupRecord r = new BackupRecord(app, backupMode, targetUserId, backupDestination);















            ComponentName hostingName =













                    (backupMode == ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL)













                    (backupMode == ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL













                            || backupMode == ApplicationThreadConstants.BACKUP_MODE_RESTORE)















                            ? new ComponentName(app.packageName, app.backupAgentName)















                            : new ComponentName("android", "FullBackupAgent");