commit 713cf9ac1261b5615b17a7da02103e8d23db04d2
author Eghosa Ewansiha-Vlachavas <eevlachavas@google.com> Mon Aug 22 14:55:57 2022 +0000
committer Eghosa Ewansiha-Vlachavas <eevlachavas@google.com> Wed Aug 24 08:20:20 2022 +0000
tree 1ba680cd6aa5fe1792c688d547456c119838ee49
parent a61c60e9ca44c19604ab7baa616f3659e430f322

Merge check Device ID logic in DPMS

checkDeviceIdentifierAccess() and
enforceCallerCanRequestDeviceIdAttestation() overlap in terms of
checking if the caller has acces to the device ID. However they each use
different logic for this check. To ensure these two checks are always
in sync, they should call the same underlying code wherever logic can overlap.

Fixes: 220721469
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testKeyManagement
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegatedCertInstallerDirectly
Test:atest android.admin.cts.DevicePolicyManagerTest
Change-Id: Ibe196123640c1d2d29fd62c7c77453c0874fc7a3