summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-09-06 18:32:56 +0200
committerAdam Cohen <adamcohen@google.com>2014-09-06 18:34:16 +0200
commitcd1452859d0a0d68a70388a3ae82d69d97041eb5 (patch)
tree0fd84a5629f08c55094d48ede30d96b25b8eed8a
parentc761d3cf956c5d2e621fabe91dcf65924fe9cf0a (diff)
downloadandroid_packages_apps_Trebuchet-cd1452859d0a0d68a70388a3ae82d69d97041eb5.tar.gz
android_packages_apps_Trebuchet-cd1452859d0a0d68a70388a3ae82d69d97041eb5.tar.bz2
android_packages_apps_Trebuchet-cd1452859d0a0d68a70388a3ae82d69d97041eb5.zip
Second half of workaround for all apps crash in restricted profile
Bug 17363836 Change-Id: If83cf3ef73ce2f992f69d42bad5d6f41cc3b9b9e
-rw-r--r--src/com/android/launcher3/Launcher.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 51d74be10..924ed1158 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3620,9 +3620,6 @@ public class Launcher extends Activity
final AnimatorSet stateAnimation = mStateAnimation;
final Runnable startAnimRunnable = new Runnable() {
public void run() {
- if (!fromView.isAttachedToWindow()) {
- return;
- }
// Check that mStateAnimation hasn't changed while
// we waited for a layout/draw pass
if (mStateAnimation != stateAnimation)
@@ -3633,7 +3630,7 @@ public class Launcher extends Activity
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();