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

Commit a1eab00e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename RefactoredBackupManagerService to BackupManagerService"

parents 06b476d1 fe4ae0c5

services/art-profile

+35 −35
Original line number Diff line number Diff line
@@ -2134,15 +2134,15 @@ HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->requestHideFil 
HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->requestShowFillUi(Landroid/view/autofill/AutofillId;IILandroid/view/autofill/IAutofillWindowPresenter;)V

HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->save()V

HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->startIntentSender(Landroid/content/IntentSender;)V

HPLcom/android/server/backup/RefactoredBackupManagerService;->addPackageParticipantsLockedInner(Ljava/lang/String;Ljava/util/List;)V

HPLcom/android/server/backup/RefactoredBackupManagerService;->allAgentPackages()Ljava/util/List;

HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChanged(Ljava/lang/String;)V

HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChangedImpl(Ljava/lang/String;)V

HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChangedImpl(Ljava/lang/String;Ljava/util/HashSet;)V

HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChangedTargets(Ljava/lang/String;)Ljava/util/HashSet;

HPLcom/android/server/backup/RefactoredBackupManagerService;->dequeueFullBackupLocked(Ljava/lang/String;)V

HPLcom/android/server/backup/RefactoredBackupManagerService;->readFullBackupSchedule()Ljava/util/ArrayList;

HPLcom/android/server/backup/RefactoredBackupManagerService;->writeToJournalLocked(Ljava/lang/String;)V

HPLcom/android/server/backup/BackupManagerService;->addPackageParticipantsLockedInner(Ljava/lang/String;Ljava/util/List;)V

HPLcom/android/server/backup/BackupManagerService;->allAgentPackages()Ljava/util/List;

HPLcom/android/server/backup/BackupManagerService;->dataChanged(Ljava/lang/String;)V

HPLcom/android/server/backup/BackupManagerService;->dataChangedImpl(Ljava/lang/String;)V

HPLcom/android/server/backup/BackupManagerService;->dataChangedImpl(Ljava/lang/String;Ljava/util/HashSet;)V

HPLcom/android/server/backup/BackupManagerService;->dataChangedTargets(Ljava/lang/String;)Ljava/util/HashSet;

HPLcom/android/server/backup/BackupManagerService;->dequeueFullBackupLocked(Ljava/lang/String;)V

HPLcom/android/server/backup/BackupManagerService;->readFullBackupSchedule()Ljava/util/ArrayList;

HPLcom/android/server/backup/BackupManagerService;->writeToJournalLocked(Ljava/lang/String;)V

HPLcom/android/server/backup/BackupManagerServiceInterface;->acknowledgeAdbBackupOrRestore(IZLjava/lang/String;Ljava/lang/String;Landroid/app/backup/IFullBackupRestoreObserver;)V

HPLcom/android/server/backup/BackupManagerServiceInterface;->adbBackup(Landroid/os/ParcelFileDescriptor;ZZZZZZZZ[Ljava/lang/String;)V

HPLcom/android/server/backup/BackupManagerServiceInterface;->adbRestore(Landroid/os/ParcelFileDescriptor;)V
@@ -9358,37 +9358,37 @@ PLcom/android/server/autofill/ui/AutoFillUI;->lambda$-com_android_server_autofil 
PLcom/android/server/autofill/ui/AutoFillUI;->lambda$-com_android_server_autofill_ui_AutoFillUI_4826(Lcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;Ljava/lang/String;)V

PLcom/android/server/autofill/ui/AutoFillUI;->setCallback(Lcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;)V

PLcom/android/server/autofill/ui/OverlayControl;-><init>(Landroid/content/Context;)V

PLcom/android/server/backup/RefactoredBackupManagerService$Lifecycle;-><init>(Landroid/content/Context;)V

PLcom/android/server/backup/RefactoredBackupManagerService$Lifecycle;->onStart()V

PLcom/android/server/backup/RefactoredBackupManagerService$Lifecycle;->onUnlockUser(I)V

PLcom/android/server/backup/RefactoredBackupManagerService;-><init>(Landroid/content/Context;Lcom/android/server/backup/Trampoline;)V

PLcom/android/server/backup/RefactoredBackupManagerService;->addPackageParticipantsLocked([Ljava/lang/String;)V

PLcom/android/server/backup/RefactoredBackupManagerService;->backupSettingMigrated(I)Z

PLcom/android/server/backup/RefactoredBackupManagerService;->enqueueFullBackup(Ljava/lang/String;J)V

PLcom/android/server/backup/RefactoredBackupManagerService;->getCurrentTransport()Ljava/lang/String;

PLcom/android/server/backup/RefactoredBackupManagerService;->initPackageTracking()V

PLcom/android/server/backup/RefactoredBackupManagerService;->isBackupEnabled()Z

PLcom/android/server/backup/RefactoredBackupManagerService;->parseLeftoverJournals()V

PLcom/android/server/backup/RefactoredBackupManagerService;->readBackupEnableState(I)Z

PLcom/android/server/backup/RefactoredBackupManagerService;->removePackageFromSetLocked(Ljava/util/HashSet;Ljava/lang/String;)V

PLcom/android/server/backup/RefactoredBackupManagerService;->removePackageParticipantsLocked([Ljava/lang/String;I)V

PLcom/android/server/backup/RefactoredBackupManagerService;->scheduleNextFullBackupJob(J)V

PLcom/android/server/backup/RefactoredBackupManagerService;->selectBackupTransportAsync(Landroid/content/ComponentName;Landroid/app/backup/ISelectBackupTransportCallback;)V

PLcom/android/server/backup/RefactoredBackupManagerService;->setBackupEnabled(Z)V

PLcom/android/server/backup/RefactoredBackupManagerService;->updateStateForTransport(Ljava/lang/String;)V

PLcom/android/server/backup/RefactoredBackupManagerService;->writeBackupEnableState(ZI)V

PLcom/android/server/backup/RefactoredBackupManagerService;->writeFullBackupScheduleAsync()V

PLcom/android/server/backup/BackupManagerService$Lifecycle;-><init>(Landroid/content/Context;)V

PLcom/android/server/backup/BackupManagerService$Lifecycle;->onStart()V

PLcom/android/server/backup/BackupManagerService$Lifecycle;->onUnlockUser(I)V

PLcom/android/server/backup/BackupManagerService;-><init>(Landroid/content/Context;Lcom/android/server/backup/Trampoline;)V

PLcom/android/server/backup/BackupManagerService;->addPackageParticipantsLocked([Ljava/lang/String;)V

PLcom/android/server/backup/BackupManagerService;->backupSettingMigrated(I)Z

PLcom/android/server/backup/BackupManagerService;->enqueueFullBackup(Ljava/lang/String;J)V

PLcom/android/server/backup/BackupManagerService;->getCurrentTransport()Ljava/lang/String;

PLcom/android/server/backup/BackupManagerService;->initPackageTracking()V

PLcom/android/server/backup/BackupManagerService;->isBackupEnabled()Z

PLcom/android/server/backup/BackupManagerService;->parseLeftoverJournals()V

PLcom/android/server/backup/BackupManagerService;->readBackupEnableState(I)Z

PLcom/android/server/backup/BackupManagerService;->removePackageFromSetLocked(Ljava/util/HashSet;Ljava/lang/String;)V

PLcom/android/server/backup/BackupManagerService;->removePackageParticipantsLocked([Ljava/lang/String;I)V

PLcom/android/server/backup/BackupManagerService;->scheduleNextFullBackupJob(J)V

PLcom/android/server/backup/BackupManagerService;->selectBackupTransportAsync(Landroid/content/ComponentName;Landroid/app/backup/ISelectBackupTransportCallback;)V

PLcom/android/server/backup/BackupManagerService;->setBackupEnabled(Z)V

PLcom/android/server/backup/BackupManagerService;->updateStateForTransport(Ljava/lang/String;)V

PLcom/android/server/backup/BackupManagerService;->writeBackupEnableState(ZI)V

PLcom/android/server/backup/BackupManagerService;->writeFullBackupScheduleAsync()V

PLcom/android/server/backup/FullBackupJob;->schedule(Landroid/content/Context;J)V

PLcom/android/server/backup/KeyValueBackupJob;->cancel(Landroid/content/Context;)V

PLcom/android/server/backup/Trampoline;-><init>(Landroid/content/Context;)V

PLcom/android/server/backup/Trampoline;->createRefactoredBackupManagerService()Lcom/android/server/backup/BackupManagerServiceInterface;

PLcom/android/server/backup/Trampoline;->createBackupManagerService()Lcom/android/server/backup/BackupManagerServiceInterface;

PLcom/android/server/backup/Trampoline;->createService()Lcom/android/server/backup/BackupManagerServiceInterface;

PLcom/android/server/backup/Trampoline;->getCurrentTransport()Ljava/lang/String;

PLcom/android/server/backup/Trampoline;->getSuppressFile()Ljava/io/File;

PLcom/android/server/backup/Trampoline;->initialize(I)V

PLcom/android/server/backup/Trampoline;->isBackupDisabled()Z

PLcom/android/server/backup/Trampoline;->isBackupEnabled()Z

PLcom/android/server/backup/Trampoline;->isRefactoredServiceEnabled()Z

PLcom/android/server/backup/Trampoline;->isServiceEnabled()Z

PLcom/android/server/backup/Trampoline;->selectBackupTransportAsync(Landroid/content/ComponentName;Landroid/app/backup/ISelectBackupTransportCallback;)V

PLcom/android/server/backup/Trampoline;->setBackupEnabled(Z)V

PLcom/android/server/backup/TransportManager$RebindOnTimeoutHandler;-><init>(Lcom/android/server/backup/TransportManager;Landroid/os/Looper;)V
@@ -9422,13 +9422,13 @@ PLcom/android/server/backup/TransportManager;->onPackageChanged(Ljava/lang/Strin 
PLcom/android/server/backup/TransportManager;->registerAllTransports()V

PLcom/android/server/backup/TransportManager;->selectTransport(Ljava/lang/String;)Ljava/lang/String;

PLcom/android/server/backup/TransportManager;->tryBindTransport(Landroid/content/ComponentName;)V

PLcom/android/server/backup/internal/BackupHandler;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;Landroid/os/Looper;)V

PLcom/android/server/backup/internal/BackupHandler;-><init>(Lcom/android/server/backup/BackupManagerService;Landroid/os/Looper;)V

PLcom/android/server/backup/fullbackup/FullBackupEntry;->compareTo(Lcom/android/server/backup/fullbackup/FullBackupEntry;)I

PLcom/android/server/backup/fullbackup/FullBackupEntry;->compareTo(Ljava/lang/Object;)I

PLcom/android/server/backup/internal/BackupHandler;->handleMessage(Landroid/os/Message;)V

PLcom/android/server/backup/internal/ProvisionedObserver;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;Landroid/os/Handler;)V

PLcom/android/server/backup/internal/RunBackupReceiver;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;)V

PLcom/android/server/backup/internal/RunInitializeReceiver;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;)V

PLcom/android/server/backup/internal/ProvisionedObserver;-><init>(Lcom/android/server/backup/BackupManagerService;Landroid/os/Handler;)V

PLcom/android/server/backup/internal/RunBackupReceiver;-><init>(Lcom/android/server/backup/BackupManagerService;)V

PLcom/android/server/backup/internal/RunInitializeReceiver;-><init>(Lcom/android/server/backup/BackupManagerService;)V

PLcom/android/server/backup/utils/AppBackupUtils;->appGetsFullBackup(Landroid/content/pm/PackageInfo;)Z

PLcom/android/server/camera/CameraServiceProxy$1;-><init>(Lcom/android/server/camera/CameraServiceProxy;)V

PLcom/android/server/camera/CameraServiceProxy$2;-><init>(Lcom/android/server/camera/CameraServiceProxy;)V

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

+8 −10
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.server.backup; 


import android.app.AlarmManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Handler;
@@ -133,7 +131,7 @@ class BackupManagerConstants extends ContentObserver { 
    // group the calls of these methods in a block syncrhonized on

    // a reference of this object.

    public synchronized long getKeyValueBackupIntervalMilliseconds() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getKeyValueBackupIntervalMilliseconds(...) returns "

                    + mKeyValueBackupIntervalMilliseconds);

        }
@@ -141,7 +139,7 @@ class BackupManagerConstants extends ContentObserver { 
    }



    public synchronized long getKeyValueBackupFuzzMilliseconds() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getKeyValueBackupFuzzMilliseconds(...) returns "

                    + mKeyValueBackupFuzzMilliseconds);

        }
@@ -149,7 +147,7 @@ class BackupManagerConstants extends ContentObserver { 
    }



    public synchronized boolean getKeyValueBackupRequireCharging() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getKeyValueBackupRequireCharging(...) returns "

                    + mKeyValueBackupRequireCharging);

        }
@@ -157,7 +155,7 @@ class BackupManagerConstants extends ContentObserver { 
    }



    public synchronized int getKeyValueBackupRequiredNetworkType() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getKeyValueBackupRequiredNetworkType(...) returns "

                    + mKeyValueBackupRequiredNetworkType);

        }
@@ -165,7 +163,7 @@ class BackupManagerConstants extends ContentObserver { 
    }



    public synchronized long getFullBackupIntervalMilliseconds() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getFullBackupIntervalMilliseconds(...) returns "

                    + mFullBackupIntervalMilliseconds);

        }
@@ -173,14 +171,14 @@ class BackupManagerConstants extends ContentObserver { 
    }



    public synchronized boolean getFullBackupRequireCharging() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getFullBackupRequireCharging(...) returns " + mFullBackupRequireCharging);

        }

        return mFullBackupRequireCharging;

    }



    public synchronized int getFullBackupRequiredNetworkType() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getFullBackupRequiredNetworkType(...) returns "

                    + mFullBackupRequiredNetworkType);

        }
@@ -191,7 +189,7 @@ class BackupManagerConstants extends ContentObserver { 
     * Returns an array of package names that should be notified whenever a backup finishes.

     */

    public synchronized String[] getBackupFinishedNotificationReceivers() {

        if (RefactoredBackupManagerService.DEBUG_SCHEDULING) {

        if (BackupManagerService.DEBUG_SCHEDULING) {

            Slog.v(TAG, "getBackupFinishedNotificationReceivers(...) returns "

                    + TextUtils.join(", ", mBackupFinishedNotificationReceivers));

        }

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

+5 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.app.AppGlobals; 
import android.app.IActivityManager;

import android.app.IBackupAgent;

import android.app.PendingIntent;

import android.app.admin.DevicePolicyManager;

import android.app.backup.BackupManager;

import android.app.backup.BackupManagerMonitor;

import android.app.backup.FullBackup;
@@ -158,7 +157,7 @@ import java.util.Set; 
import java.util.concurrent.CountDownLatch;

import java.util.concurrent.atomic.AtomicInteger;



public class RefactoredBackupManagerService implements BackupManagerServiceInterface {

public class BackupManagerService implements BackupManagerServiceInterface {



    public static final String TAG = "BackupManagerService";

    public static final boolean DEBUG = true;
@@ -628,7 +627,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter 
     * A BackupRestore task gets notified of ack/timeout for the operation via

     * BackupRestoreTask#handleCancel, BackupRestoreTask#operationComplete and notifyAll called

     * on the mCurrentOpLock.

     * {@link RefactoredBackupManagerService#waitUntilOperationComplete(int)} is

     * {@link BackupManagerService#waitUntilOperationComplete(int)} is

     * used in various places to 'wait' for notifyAll and detect change of pending state of an

     * operation. So typically, an operation will be removed from this array by:

     * - BackupRestoreTask#handleCancel and
@@ -739,7 +738,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter 


    // ----- Main service implementation -----



    public static RefactoredBackupManagerService create(

    public static BackupManagerService create(

            Context context,

            Trampoline parent,

            HandlerThread backupThread) {
@@ -772,7 +771,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter 
        // This dir on /cache is managed directly in init.rc

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



        return new RefactoredBackupManagerService(

        return new BackupManagerService(

                context,

                parent,

                backupThread,
@@ -782,7 +781,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter 
    }



    @VisibleForTesting

    RefactoredBackupManagerService(

    BackupManagerService(

            Context context,

            Trampoline parent,

            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.RefactoredBackupManagerService.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 = RefactoredBackupManagerService.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 = RefactoredBackupManagerService.getInstance();

            Trampoline service = BackupManagerService.getInstance();

            service.endFullBackup();

        }

        return false;