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

Commit c570b418 authored by Al Sutton's avatar Al Sutton Committed by Automerger Merge Worker
Browse files

Add userId to log messages - DO NOT MERGE am: c4d9e91f 

Change-Id: I37baf8357d6ec1b0a95b5d6f80d4feeaa6cf6781
parents 85f086fa 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);

    }



    /**