commit 03acedd57a3433673152b45145f93e81ceef3f2f
author Adam Cohen <adamcohen@google.com> Mon Sep 08 11:30:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 08 11:30:34 2014 +0000
tree 43d09a36060424605d7e555a9c7898e8a0e4759c
parent e962acef86a4f1f634f268baa0102fc334db60c4
parent c761d3cf956c5d2e621fabe91dcf65924fe9cf0a

am c761d3cf: Workaround for all apps crash in restricted profile

* commit 'c761d3cf956c5d2e621fabe91dcf65924fe9cf0a':
  Workaround for all apps crash in restricted profile

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 309ab46..51d74be 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3375,9 +3375,6 @@
             final AnimatorSet stateAnimation = mStateAnimation;
             final Runnable startAnimRunnable = new Runnable() {
                 public void run() {
-                    if (!toView.isAttachedToWindow()) {
-                        return;
-                    }
                     // Check that mStateAnimation hasn't changed while
                     // we waited for a layout/draw pass
                     if (mStateAnimation != stateAnimation)
@@ -3389,7 +3386,7 @@
                     if (Utilities.isLmp()) {
                         for (int i = 0; i < layerViews.size(); i++) {
                             View v = layerViews.get(i);
-                            if (v != null) v.buildLayer();
+                            if (v != null && v.isAttachedToWindow()) v.buildLayer();
                         }
                     }
                     mStateAnimation.start();