OSDN Git Service

[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).
authorJonathan Scott <scottjonathan@google.com>
Thu, 9 May 2019 10:52:47 +0000 (11:52 +0100)
committerNikoli Cartagena <dargeren@google.com>
Mon, 10 Jun 2019 20:59:55 +0000 (13:59 -0700)
commitba4777f5108d28ff5ad6f36f06ad07ab5b74d5c7
tree0b69fe60c855257e9cc5982ae6d38e4896458332
parent325344e299379d7aaa661430c51d714448ede456
[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).

Bug: 127605586
Test: Manual
Change-Id: I40c9a29935d9e5a27cdcdf90187efe61035448fd
(cherry picked from commit cd6c636800b62c2c823d53b973171070fe5d8aba)
services/core/java/com/android/server/am/ActivityStackSupervisor.java