00c3f598809d5048936bafab7a54362a3e6795b2 - platform_frameworks_base

commit	00c3f598809d5048936bafab7a54362a3e6795b2	[log] [tgz]
author	Tianjie <xunchang@google.com>	Thu Mar 18 18:05:35 2021 -0700
committer	Tianjie <xunchang@google.com>	Mon Mar 22 16:14:15 2021 -0700
tree	6918ab8baf392f0af734e80dc70821d9211e4879
parent	aec4f406dfe00f1c456db4fc3bba55628fda0b26 [diff]

Add a specific error code for provider mismatches

If the device used HAL based RoR to arm the escrow key, the recovery
will fail if we switch to server based RoR after reboot. Set a
specific error for metrics purpose.

Bug: 183140900
Test: atest FrameworksServicesTests:RebootEscrowManagerTests
Change-Id: I1f33a8c6cf111d868a2b96a155f5a0926a7c788a

services/core/java/com/android/server/locksettings/RebootEscrowManager.java[diff]
services/core/java/com/android/server/locksettings/RebootEscrowProviderHalImpl.java[diff]
services/core/java/com/android/server/locksettings/RebootEscrowProviderInterface.java[diff]
services/core/java/com/android/server/locksettings/RebootEscrowProviderServerBasedImpl.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java[diff]

5 files changed