6066898f4240056a39420e12168f6d08ef5c9c03 - platform_frameworks_base

commit	6066898f4240056a39420e12168f6d08ef5c9c03	[log] [tgz]
author	Tianjie <xunchang@google.com>	Mon Mar 22 22:17:59 2021 -0700
committer	Tianjie <xunchang@google.com>	Fri Apr 09 13:18:18 2021 -0700
tree	d8cc7829a419885cbfc8ac8019efd5fc5439505a
parent	559ed7f0f0e20a39aea12632f2c8ec2f25f388c5 [diff]

Improve the error handling for armRebootEscrow

The change including the following items
1. Add error code for armRebootEscrow
2. Fail the armRebootEscrow for mismatching ror providers.
3. clear the escrow data for fatal armRebootEscrow
4. clear the RoR preparation state in recovery system for fatal
   armRebootEscrow

Bug: 183140900
Test: atest FrameworksServicesTests:RebootEscrowManagerTests;
      atest FrameworksServicesTests:RecoverySystemServiceTest;
      Change provider before reboot, reboot-and-apply failed;
Change-Id: I266ea6f2e1c77994d5cc8c2713106c527c4e0722

core/java/android/os/RecoverySystem.java[diff]
core/java/com/android/internal/widget/LockSettingsInternal.java[diff]
services/core/java/com/android/server/locksettings/LockSettingsService.java[diff]
services/core/java/com/android/server/locksettings/RebootEscrowManager.java[diff]
services/core/java/com/android/server/recoverysystem/RecoverySystemService.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTestable.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java[diff]
services/tests/servicestests/src/com/android/server/recoverysystem/RecoverySystemServiceTest.java[diff]

8 files changed