OSDN Git Service

AM: refactor LockTask whitelist update logic.
authorCharles He <qiurui@google.com>
Sat, 2 Sep 2017 14:27:16 +0000 (15:27 +0100)
committerCharles He <qiurui@google.com>
Mon, 18 Sep 2017 14:05:34 +0000 (15:05 +0100)
commit520b283ada40246afe051f0505294e4080d4c912
tree1297f9569ec4dfff945918dcc238b6613915b016
parent1683efe4eca1bc6e9ebb9fe9b9997dc608354e9b
AM: refactor LockTask whitelist update logic.

Previously, ActivityManagerService owned the LockTask package whitelist,
whereas LockTaskController contained the update logic. In this refactor,
we simplify the structure by moving the whitelist into LockTaskController.
We also add instrumentation tests to verify this behavior.

Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Test: runtest frameworks-services
Test: go/wm-smoke
Test: cts-tradefed run cts-dev -m DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Bug: 63909481
Change-Id: I15ef4a446de800336f2bf9cbbd4acf6685e29320
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
services/core/java/com/android/server/am/LockTaskController.java
services/core/java/com/android/server/am/TaskRecord.java
services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java