diff options
| author | 2023-12-12 23:18:01 +0000 | |
|---|---|---|
| committer | 2023-12-12 23:45:06 +0000 | |
| commit | ada6ce9436e2d4b466dabb5fc10b822cf482a9ce (patch) | |
| tree | 523e0dca17e2d1c61c8281159704c28e62fa2e2e /api/coverage/tools | |
| parent | 91755c24d0d4f74a8a86a6614b2136c4eb42111c (diff) | |
Sync tieProfileLockIfNecessary() with internal main
The internal-first commit ab75d2ceb232 (http://ag/23150174) modified
tieProfileLockIfNecessary(), which is now causing conflicts. As the
modification to tieProfileLockIfNecessary() (which simply made it not
crash when called with a profile that does not have a parent) does not
depend on the rest of the change, cherry-pick it separately.
Test: atest com.android.server.locksettings
Merged-In: Ib0e4e52c10f0e95913ddfde606d6995de3538f27
Change-Id: I323811363d8801d4f0bc84f241ad042f45bb3358
Diffstat (limited to 'api/coverage/tools')
0 files changed, 0 insertions, 0 deletions