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

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

Merge "Add userId to log messages - DO NOT MERGE" into rvc-dev

parents a80e3217 c4d9e91f

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

+742 −222

File changed.

Preview size limit exceeded, changes collapsed.

services/robotests/backup/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class BackupManagerServiceTestUtils { 
        PowerManager powerManager =

                (PowerManager) application.getSystemService(Context.POWER_SERVICE);

        return new UserBackupManagerService.BackupWakeLock(

                powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*backup*"));

                powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*backup*"), 0);

    }



    /**