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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-18 14:10:53 +00:00
committed by Android (Google) Code Review
parent a80e32178b c4d9e91f85
commit 5191bb759f
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);
}
/**