diff options
| author | Patrick Dubroy <dubroy@google.com> | 2011-03-15 10:46:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 10:46:59 -0700 |
| commit | 40523ceefd927b166f2066ac742a59e1d4bde54d (patch) | |
| tree | 310f6df16c051725fa641c4911d113174cda492f /src/com | |
| parent | 45e57862d7695a2cf2d19c1b41533c3c763be475 (diff) | |
| parent | 166e99ee68d59c689d473d736464d3a096185d77 (diff) | |
| download | android_packages_apps_Trebuchet-40523ceefd927b166f2066ac742a59e1d4bde54d.tar.gz android_packages_apps_Trebuchet-40523ceefd927b166f2066ac742a59e1d4bde54d.tar.bz2 android_packages_apps_Trebuchet-40523ceefd927b166f2066ac742a59e1d4bde54d.zip | |
am 166e99ee: am d69e1138: Fix 4093841: Launcher crash after downloading app & hitting back
* commit '166e99ee68d59c689d473d736464d3a096185d77':
Fix 4093841: Launcher crash after downloading app & hitting back
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index f18a24197..146485489 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -264,8 +264,10 @@ public class BubbleTextView extends TextView implements VisibilityChangedBroadca void setCellLayoutPressedOrFocusedIcon() { CellLayoutChildren parent = (CellLayoutChildren) getParent(); - CellLayout cellLayout = (CellLayout) parent.getParent(); - cellLayout.setPressedOrFocusedIcon((mPressedOrFocusedBackground != null) ? this : null); + if (parent != null) { + CellLayout layout = (CellLayout) parent.getParent(); + layout.setPressedOrFocusedIcon((mPressedOrFocusedBackground != null) ? this : null); + } } Bitmap getPressedOrFocusedBackground() { |