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

Commit 25b54058 authored by Stefano Tommasini's avatar Stefano Tommasini Committed by Android (Google) Code Review
Browse files

Merge "Make Trampoline support multi-user backup."

parents 0fa45f1e 72d03de8

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

+11 −1
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ public class BackupManagerService { 
     */

    @VisibleForTesting

    protected void startServiceForUser(int userId) {

        if (mServiceUsers.get(userId) != null) {

            Slog.i(TAG, "userId " + userId + " already started, so not starting again");

            return;

        }



        UserBackupManagerService userBackupManagerService =

                UserBackupManagerService.createAndInitializeService(

                        userId, mContext, mTrampoline, mTransportWhitelist);
@@ -155,7 +160,12 @@ public class BackupManagerService { 
        }

    }



    SparseArray<UserBackupManagerService> getServiceUsers() {

    /**

     *  Returns a lst of users currently unlocked that have a

     *  {@link UserBackupManagerService} registered.

     */

    @VisibleForTesting

    public SparseArray<UserBackupManagerService> getServiceUsers() {

        return mServiceUsers;

    }

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

+133 −131

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java

+186 −141

File changed.

Preview size limit exceeded, changes collapsed.