commit 0f668f3c2be93ad9be221d868abb3d9a6e418f18
author Adam Cohen <adamcohen@google.com> Mon Sep 08 19:54:17 2014 +0200
committer Adam Cohen <adamcohen@google.com> Tue Sep 09 10:00:48 2014 +0000
tree dfaefe5b42820567e63ac9ef7ebc52614e00ae18
parent 55f77f983afeffd2240ccd24d783e6d8d3ab44fd

Prevent GNL from crashing on JB

issue 17433546

Change-Id: Ie5071e516b26400a27473eaaa401023f1af1d840

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 33cc29e..5c6261d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -59,6 +59,7 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -3378,7 +3379,13 @@
                     if (Utilities.isLmp()) {
                         for (int i = 0; i < layerViews.size(); i++) {
                             View v = layerViews.get(i);
-                            if (v != null && v.isAttachedToWindow()) v.buildLayer();
+                            if (v != null) {
+                                boolean attached = true;
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                                    attached = v.isAttachedToWindow();
+                                }
+                                if (attached) v.buildLayer();
+                            }
                         }
                     }
                     mStateAnimation.start();
@@ -3625,7 +3632,13 @@
                     if (Utilities.isLmp()) {
                         for (int i = 0; i < layerViews.size(); i++) {
                             View v = layerViews.get(i);
-                            if (v != null && v.isAttachedToWindow()) v.buildLayer();
+                            if (v != null) {
+                                boolean attached = true;
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                                    attached = v.isAttachedToWindow();
+                                }
+                                if (attached) v.buildLayer();
+                            }
                         }
                     }
                     mStateAnimation.start();