diff options
| author | Jim Miller <jaggies@google.com> | 2014-05-21 20:43:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 20:43:18 +0000 |
| commit | 6f3546796a381a17e4e8e6dbf869ca75abfab696 (patch) | |
| tree | 6b90c42fb952a6497572f805d2763d530dcc6c2e /packages | |
| parent | 82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a (diff) | |
| parent | af103dd39346d1bae3566cafbfcd1008bc6cef5c (diff) | |
| download | frameworks_base-6f3546796a381a17e4e8e6dbf869ca75abfab696.zip frameworks_base-6f3546796a381a17e4e8e6dbf869ca75abfab696.tar.gz frameworks_base-6f3546796a381a17e4e8e6dbf869ca75abfab696.tar.bz2 | |
am af103dd3: am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE
* commit 'af103dd39346d1bae3566cafbfcd1008bc6cef5c':
Fix crash in widget pager - DO NOT MERGE
Diffstat (limited to 'packages')
| -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 99f7757..d1cfc48 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), |