OSDN Git Service

Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSl...
authorAdrian Roos <roosa@google.com>
Fri, 7 Jul 2017 19:17:27 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 19:17:27 +0000 (19:17 +0000)
commitab78a4707b276a58c758e5a7122a21d75403497b
treeffceac9370ccbfc06c1e72ed9ba0683abcb7878b
parenteeae0c3253f69cc21ef7c331264a0e3b7fabec7e
parentf53f45e06f893d859b2596462fba66a17cb77d99
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev am: eacef7a03a
am: f53f45e06f

Change-Id: I58f11a9e583a4af800868b47e90636c342425745
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java