commit 19e0fc53c43a7746d7ae3d7c6027166bded33f0f
author Michael Jurka <mikejurka@google.com> Fri Jul 22 18:00:21 2011 -0700
committer Michael Jurka <mikejurka@google.com> Sat Jul 23 12:48:57 2011 -0700
tree 42c7129fdf4e6d7e04dd1f9a5a45d6ce52b50e9d
parent 1228b3bc8e523ad07bcac602d89890690c9f06ef

Fix two crashes

- NPE: bug #4984219
- IllegalStateException: bug #4969695

Change-Id: Iaf02e669b26f9277388e0e7bffd532220ebf9bb1

src/com/android/launcher2/AppsCustomizeTabHost.java

diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index ed408df..d3215f0 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -207,7 +207,10 @@
     /* LauncherTransitionable overrides */
     @Override
     public void onLauncherTransitionStart(Animator animation) {
-        if (animation != null) {
+        // isHardwareAccelerated() checks if we're attached to a window and if that
+        // window is HW accelerated-- we were sometimes not attached to a window
+        // and buildLayer was throwing an IllegalStateException
+        if (animation != null && isHardwareAccelerated()) {
             // Turn on hardware layers for performance
             setLayerType(LAYER_TYPE_HARDWARE, null);