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

Commit 30b96748 authored by Sarp Misoglu's avatar Sarp Misoglu
Browse files

Set mUser inside the onCreate(user) method in BackupAgent 

onCreate(user) is only used for PackageManagerBackupAgent, and not setting it causes package manager backup to be unable to communicate it's done to the restore task.

Bug: 266940303
Test: manual, factory reset and restore a cloud backup on an HSUM device
Change-Id: Ib6a21ebed486031e179d62173afcfbb466a25412
parent 9a0c93a4

core/java/android/app/backup/BackupAgent.java

+2 −10
Original line number Diff line number Diff line
@@ -265,15 +265,9 @@ public abstract class BackupAgent extends ContextWrapper { 
    public void onCreate() {

    }



    /**

     * Provided as a convenience for agent implementations that need an opportunity

     * to do one-time initialization before the actual backup or restore operation

     * is begun with information about the calling user.

     * <p>

     *

     * @hide

     */

    /** @hide */

    public void onCreate(UserHandle user) {

        mUser = user;

        onCreate();

    }
@@ -284,7 +278,6 @@ public abstract class BackupAgent extends ContextWrapper { 
     */

    @Deprecated

    public void onCreate(UserHandle user, @BackupDestination int backupDestination) {

        mUser = user;

        mBackupDestination = backupDestination;



        onCreate(user);
@@ -295,7 +288,6 @@ public abstract class BackupAgent extends ContextWrapper { 
    */

    public void onCreate(UserHandle user, @BackupDestination int backupDestination,

            @OperationType int operationType) {

        mUser = user;

        mBackupDestination = backupDestination;

        mLogger = new BackupRestoreEventLogger(operationType);