diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-05-13 22:13:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 22:13:27 +0000 |
| commit | 645edef4834c2911386b659cc775840fb7479e01 (patch) | |
| tree | 884357eaf58202c10695217ba404e6999c9af23d /packages/SystemUI | |
| parent | 4d0f2afdc4332c28193d2d57a11f260150b0b4b3 (diff) | |
| parent | 827e0facfefd0c0033dcfb1747b4fa6f80f9e0e2 (diff) | |
| download | frameworks_base-645edef4834c2911386b659cc775840fb7479e01.zip frameworks_base-645edef4834c2911386b659cc775840fb7479e01.tar.gz frameworks_base-645edef4834c2911386b659cc775840fb7479e01.tar.bz2 | |
Merge "Make sure the app can draw a frame before unlocking" into mnc-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 6479dc5..74962ec 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -1335,7 +1335,7 @@ public class KeyguardViewMediator extends SystemUI { // Don't actually hide the Keyguard at the moment, wait for window // manager until it tells us it's safe to do so with // startKeyguardExitAnimation. - mWM.keyguardGoingAway( + ActivityManagerNative.getDefault().keyguardGoingAway( mStatusBarKeyguardViewManager.shouldDisableWindowAnimationsForUnlock(), mStatusBarKeyguardViewManager.isGoingToNotificationShade()); } catch (RemoteException e) { |