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

Commit 15bf74cf authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Merge Trampoline and BMS 

Perform the merge by:
1. Moving lifecycle inside Trampoline without IDE support
(since we'll rename Trampoline in this CL as well, making the published binder
the same).
2. Move constants to Trampoline without IDE support as well (again, we'll
rename Trampoline).
3. Change the last usages of BMS constructor to use
Trampoline's. Now BMS is effectively empty.
4. Delete BMS.
5. Rename Trampoline to BMS with IDE support (renaming related classes
and variables that the IDE could find).
6. \o/

Split CL into Path Sets to ease review:
Base > PS2: Steps 1..4 (+121 -333)
PS2 > PS4: Step 5 (+214 -204)

Test: m -j
Test: adb shell dumpsys backup
Test: atest BackupManagerServiceTest BackupManagerServiceRoboTest
Bug: 135661048
Change-Id: Ia6cd340d3c5fcdb9c8f409035d032efeb090cd20
parent aa032460

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

+1512 −19

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class FullBackupJob extends JobService { 
            mParamsForUser.put(userId, params);

        }



        Trampoline service = Trampoline.getInstance();

        BackupManagerService service = BackupManagerService.getInstance();

        return service.beginFullBackup(userId, this);

    }
@@ -105,7 +105,7 @@ public class FullBackupJob extends JobService { 
            }

        }



        Trampoline service = Trampoline.getInstance();

        BackupManagerService service = BackupManagerService.getInstance();

        service.endFullBackup(userId);



        return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class KeyValueBackupJob extends JobService { 
        }



        // Time to run a key/value backup!

        Trampoline service = Trampoline.getInstance();

        BackupManagerService service = BackupManagerService.getInstance();

        try {

            service.backupNowForUser(userId);

        } catch (RemoteException e) {}

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

deleted100644 → 0
+0 −1549

File deleted.

Preview size limit exceeded, changes collapsed.

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

+10 −10
Original line number Diff line number Diff line
@@ -421,13 +421,13 @@ public class UserBackupManagerService { 
     * Creates an instance of {@link UserBackupManagerService} and initializes state for it. This

     * includes setting up the directories where we keep our bookkeeping and transport management.

     *

     * @see #createAndInitializeService(int, Context, Trampoline, HandlerThread, File, File,

     *     TransportManager)

     * @see #createAndInitializeService(int, Context, BackupManagerService, HandlerThread, File,

     * File, TransportManager)

     */

    static UserBackupManagerService createAndInitializeService(

            @UserIdInt int userId,

            Context context,

            Trampoline trampoline,

            BackupManagerService backupManagerService,

            Set<ComponentName> transportWhitelist) {

        String currentTransport =

                Settings.Secure.getStringForUser(
@@ -455,7 +455,7 @@ public class UserBackupManagerService { 
        return createAndInitializeService(

                userId,

                context,

                trampoline,

                backupManagerService,

                userBackupThread,

                baseStateDir,

                dataDir,
@@ -467,7 +467,7 @@ public class UserBackupManagerService { 
     *

     * @param userId The user which this service is for.

     * @param context The system server context.

     * @param trampoline A reference to the proxy to {@link BackupManagerService}.

     * @param backupManagerService A reference to the proxy to {@link BackupManagerService}.

     * @param userBackupThread The thread running backup/restore operations for the user.

     * @param baseStateDir The directory we store the user's persistent bookkeeping data.

     * @param dataDir The directory we store the user's temporary staging data.
@@ -478,7 +478,7 @@ public class UserBackupManagerService { 
    public static UserBackupManagerService createAndInitializeService(

            @UserIdInt int userId,

            Context context,

            Trampoline trampoline,

            BackupManagerService backupManagerService,

            HandlerThread userBackupThread,

            File baseStateDir,

            File dataDir,
@@ -486,7 +486,7 @@ public class UserBackupManagerService { 
        return new UserBackupManagerService(

                userId,

                context,

                trampoline,

                backupManagerService,

                userBackupThread,

                baseStateDir,

                dataDir,
@@ -509,7 +509,7 @@ public class UserBackupManagerService { 
    private UserBackupManagerService(

            @UserIdInt int userId,

            Context context,

            Trampoline parent,

            BackupManagerService parent,

            HandlerThread userBackupThread,

            File baseStateDir,

            File dataDir,
@@ -525,8 +525,8 @@ public class UserBackupManagerService { 
        mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);

        mStorageManager = IStorageManager.Stub.asInterface(ServiceManager.getService("mount"));



        checkNotNull(parent, "trampoline cannot be null");

        mBackupManagerBinder = Trampoline.asInterface(parent.asBinder());

        checkNotNull(parent, "parent cannot be null");

        mBackupManagerBinder = BackupManagerService.asInterface(parent.asBinder());



        mAgentTimeoutParameters = new

                BackupAgentTimeoutParameters(Handler.getMain(), mContext.getContentResolver());