diff options
| author | Jim Miller <jaggies@google.com> | 2014-05-21 20:39:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 20:39:41 +0000 |
| commit | af103dd39346d1bae3566cafbfcd1008bc6cef5c (patch) | |
| tree | ab361c7fec568d60fefe9ec5c97658c5458ab75a | |
| parent | 4f65a5456159b64185bb99c193bcff93b07770f8 (diff) | |
| parent | 911176d7e6c8ba28ed7f7be63edcb17456f615fe (diff) | |
am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '911176d7e6c8ba28ed7f7be63edcb17456f615fe':
Fix crash in widget pager - DO NOT MERGE
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java index 99f775787cec..d1cfc48ea090 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java @@ -846,7 +846,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit currentPage.setPivotX(0); currentPage.setPivotX(currentPage.getMeasuredWidth() / 2); } - if (!(currentPage.getScaleX() < 1f || currentPage.getScaleY() < 1f)) { + if (currentPage != null && (!(currentPage.getScaleX() < 1f || currentPage.getScaleY() < 1f))) { mZoomInOutAnim = new AnimatorSet(); mZoomInOutAnim.playTogether( ObjectAnimator.ofFloat(currentPage, "scaleX", BOUNCER_SCALE_FACTOR), |