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

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

Merge "Add userId to log messages"

parents bb3fd381 51e8bb69

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

+741 −221

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);

    }



    /**