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

Commit 384230f9 authored by Annie Meng's avatar Annie Meng
Browse files

[Multi-user] Rename GlobalBackupManagerService -> BackupManagerService 

Restore original naming since UserBackupManagerService is now merged.

Just find and replace, no functionality changes in this CL.

Bug: 118520567
Test: 1) atest RunFrameworksServicesRoboTests
2) atest $(find \
frameworks/base/services/tests/servicestests/src/com/android/server/backup \
-name '*Test.java')
3) adb shell bmgr flows
Change-Id: Ia37997cec93fac9ebb5102edfff9000c9cff4eb1
parent 813716b1

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.backup;



import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;

import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING;



import android.content.ContentResolver;

import android.os.Handler;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.backup;



import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;

import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING;



import android.app.AlarmManager;

import android.content.ContentResolver;

services/backup/java/com/android/server/backup/GlobalBackupManagerService.java→services/backup/java/com/android/server/backup/BackupManagerService.java

+6 −6
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import java.util.Set; 
 * incoming calls to the appropriate per-user {@link UserBackupManagerService} to handle the

 * corresponding backup/restore operation.

 */

public class GlobalBackupManagerService {

public class BackupManagerService {

    public static final String TAG = "BackupManagerService";

    public static final boolean DEBUG = true;

    public static final boolean MORE_DEBUG = false;
@@ -82,8 +82,8 @@ public class GlobalBackupManagerService { 
        return sInstance;

    }



    /** Helper to create the {@link GlobalBackupManagerService} instance. */

    public static GlobalBackupManagerService create(

    /** Helper to create the {@link BackupManagerService} instance. */

    public static BackupManagerService create(

            Context context,

            Trampoline parent,

            HandlerThread backupThread) {
@@ -116,7 +116,7 @@ public class GlobalBackupManagerService { 
        // This dir on /cache is managed directly in init.rc

        File dataDir = new File(Environment.getDownloadCacheDirectory(), "backup_stage");



        return new GlobalBackupManagerService(

        return new BackupManagerService(

                context,

                parent,

                backupThread,
@@ -127,8 +127,8 @@ public class GlobalBackupManagerService { 


    private UserBackupManagerService mUserBackupManagerService;



    /** Instantiate a new instance of {@link GlobalBackupManagerService}. */

    public GlobalBackupManagerService(

    /** Instantiate a new instance of {@link BackupManagerService}. */

    public BackupManagerService(

            Context context,

            Trampoline trampoline,

            HandlerThread backupThread,

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.backup;



import static com.android.server.backup.GlobalBackupManagerService.TAG;

import static com.android.server.backup.BackupManagerService.TAG;



import android.app.backup.BackupAgent;

import android.util.Slog;

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

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class FullBackupJob extends JobService { 
    @Override

    public boolean onStartJob(JobParameters params) {

        mParams = params;

        Trampoline service = GlobalBackupManagerService.getInstance();

        Trampoline service = BackupManagerService.getInstance();

        return service.beginFullBackup(this);

    }
@@ -69,7 +69,7 @@ public class FullBackupJob extends JobService { 
    public boolean onStopJob(JobParameters params) {

        if (mParams != null) {

            mParams = null;

            Trampoline service = GlobalBackupManagerService.getInstance();

            Trampoline service = BackupManagerService.getInstance();

            service.endFullBackup();

        }

        return false;