ce2a80437d196e6f05ea0a63b61141db6598f01b - platform_frameworks_base

commit	ce2a80437d196e6f05ea0a63b61141db6598f01b	[log] [tgz]
author	Hai Zhang <zhanghai@google.com>	Wed Jan 13 02:21:10 2021 -0800
committer	Hai Zhang <zhanghai@google.com>	Fri Jan 15 13:36:55 2021 -0800
tree	22c12ca5c984664171a347dfb999a05b6f099a01
parent	ce6238e0317da90cdaaf2926f62004be9be53c82 [diff]

Use a single interface for reading pre-Q and pre-S role state.

The logic to read the platform XML is moved from RoleUserState. The
logic to read legacy settings is left untouched except refactored to
return the mapping at once.

Bug: 158736025
Test: presubmit
Change-Id: Ifd1770bf869ea77b2f8a4ff8b3eae46a46cc90cf

services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java[Deleted - diff]
services/core/java/com/android/server/policy/role/LegacyRoleStateProviderImpl.java[Added - diff]
services/core/java/com/android/server/role/LegacyRoleHolderProvider.java[Deleted - diff]
services/core/java/com/android/server/role/LegacyRoleStateProvider.java[Added - diff]
services/core/java/com/android/server/role/RoleManagerService.java[diff]
services/core/java/com/android/server/role/RoleUserState.java[diff]
services/java/com/android/server/SystemServer.java[diff]

7 files changed