OSDN Git Service

Merge "Don't resume activity if user is locked and encryption is unsupported" into...
authorBryce Lee <brycelee@google.com>
Fri, 18 Aug 2017 21:33:46 +0000 (21:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 18 Aug 2017 21:33:46 +0000 (21:33 +0000)
commit1327cdc53de0d557bddeac8dabd07a2d197def3b
treee5f475525a88b217d706120ddf53a4d265651624
parentedda7ebdd98676e503d44a98b18756d28e484290
parent8558ec7dbe7733a36b621b24309e7a9dd9deec8c
Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev
services/core/java/com/android/server/am/ActivityRecord.java