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

Commit 51e8bb69 authored by Al Sutton's avatar Al Sutton
Browse files

Add userId to log messages 

Add the user ID so it's easier to see which user log messages refer to.

There's a bit of churn around conditionals in this to ensure that the
code complies with the style guidelines.

Fixes: 148376687
Test: make RunBackupFrameworksServicesRoboTests
Change-Id: I3ca92d21492fae4b89cb73fb39db1a490c796f5d
parent 2c04481b

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

    }



    /**