OSDN Git Service

Merge changes I3fd28e69,If43820b6
authorRobin Lee <rgl@google.com>
Wed, 11 Jan 2017 17:40:58 +0000 (17:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2017 17:41:01 +0000 (17:41 +0000)
commit3101b3ad21b52be9ef06400b33016cf6c973382f
treea346d411fb11ed01d14d8cc3a0bf2d43f8eab967
parent48ee82ad5b315c6df3d12d1dd647e83cc4fdb224
parentc41f6ec877309d9c73168ef8cdc277f82eb0d42e
Merge changes I3fd28e69,If43820b6

* changes:
  Lock work tasks from SystemUI instead of ActivityStarter
  Bounce work challenge through a WorkLockActivity
services/core/java/com/android/server/am/ActivityManagerService.java