OSDN Git Service

Clean up the lock task APIs for COSU devices.
authorBenjamin Franz <bfranz@google.com>
Wed, 11 Feb 2015 15:59:44 +0000 (15:59 +0000)
committerBenjamin Franz <bfranz@google.com>
Thu, 5 Mar 2015 15:02:27 +0000 (15:02 +0000)
commit43261140c3995dea77d87b587f882e651617f4b4
treebc55a34ab64179d8ffe49158703da760c1fcf89a
parent3782882192905147d05cf09a0ae568c19c2c2e22
Clean up the lock task APIs for COSU devices.

Clean up and increase readability of internal handling of lock task mode APIs.
Add a public API to query the lock task mode state with pinned and locked as
possible outcomes. Additionally, change wording in lock task toasts when in
locked mode and update the javadoc regarding onLockTaskModeEntering and
onLockTaskModeExiting to represent the actual behaviour.

Bug: 19377096
Change-Id: Ia563078ca6ef6d6fc7e75130e6b94ba18af69340
api/current.txt
api/system-current.txt
core/java/android/app/ActivityManager.java
core/java/android/app/ActivityManagerNative.java
core/java/android/app/IActivityManager.java
core/java/android/app/admin/DeviceAdminReceiver.java
core/res/res/values/strings.xml
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/LockTaskNotify.java