Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add userId to log messages - DO NOT MERGE

Browse Source 
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
This commit is contained in:
Al Sutton
2020-03-17 16:47:35 +00:00
parent a8a123c1ea
commit c4d9e91f85
2 changed files with 743 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

964
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -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);
}
/**