9de0b77cbc76bb475c97ff5a100b2026ac171397 - platform/frameworks/base

commit	9de0b77cbc76bb475c97ff5a100b2026ac171397	[log] [tgz]
author	Ruslan Tkhakokhov <rthakohov@google.com>	Mon Feb 10 10:26:21 2020 +0000
committer	Ruslan Tkhakokhov <rthakohov@google.com>	Mon Feb 10 16:41:15 2020 +0000
tree	15830ee8d8b012a7687681b466c4394118e8a205
parent	2b1f4315b0e6cde0a0c1dd42e5caf2ecd2d2441a [diff]

Get blocked restore keys directly from UserBMS

Bug: 145126096
Test: atest KeyValueRestoreExclusionHostSideTest
      atest PerformUnifiedRestoreHostSideTest
      atest UserBackupPreferencesTest

Currently PerformUnifiedRestoreTask gets the list of blocked restore
keys at construction. However, at that point the list might not be fully
constructed yet. We should get the keys through the getter avaialble in
UserBMS when we need them.

Change-Id: I62ad34138ba7a893e66d6af05d2e242c9c964a44

services/backup/java/com/android/server/backup/UserBackupManagerService.java[diff]
services/backup/java/com/android/server/backup/UserBackupPreferences.java[diff]
services/backup/java/com/android/server/backup/internal/BackupHandler.java[diff]
services/backup/java/com/android/server/backup/params/RestoreParams.java[diff]
services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java[diff]
services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java[diff]
services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java[diff]
services/tests/servicestests/src/com/android/server/backup/UserBackupPreferencesTest.java[diff]
services/tests/servicestests/src/com/android/server/backup/restore/PerformUnifiedRestoreTaskTest.java[diff]

9 files changed