am adaffc14: am a1730fa4: Merge "Debug code for window transition crash" into jb-mr1-dev

* commit 'adaffc14ecc4bdf6027677b738e65efda8548c64':
  Debug code for window transition crash

2 files changed, 11 insertions, 9 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
index c3ecdb5..b133ff9 100644
--- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
@@ -164,13 +164,6 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
         public View getView(int position, View convertView, ViewGroup parent) {
             if (convertView == null) {
                 convertView = createView(parent);
-                if (convertView.getParent() != null) {
-                    throw new RuntimeException("Recycled child has parent");
-                }
-            } else {
-                if (convertView.getParent() != null) {
-                    throw new RuntimeException("Recycled child has parent");
-                }
             }
             ViewHolder holder = (ViewHolder) convertView.getTag();
 
@@ -600,6 +593,9 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
             usingDrawingCache = true;
         }
 
+        if (bm == null) {
+            throw new RuntimeException("Recents thumbnail is null");
+        }
         ActivityOptions opts = ActivityOptions.makeThumbnailScaleUpAnimation(
                 holder.thumbnailViewImage, bm, 0, 0, null);
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 106ce7e..832cf88 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -488,11 +488,18 @@ public abstract class BaseStatusBar extends SystemUI implements
                         .getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_width);
                 float thumbHeight = res
                         .getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height);
+                if (first == null) {
+                    throw new RuntimeException("Recents thumbnail is null");
+                }
                 if (first.getWidth() != thumbWidth || first.getHeight() != thumbHeight) {
                     first = Bitmap.createScaledBitmap(first, (int) thumbWidth, (int) thumbHeight,
                             true);
+                    if (first == null) {
+                        throw new RuntimeException("Recents thumbnail is null");
+                    }
                 }
 
+
                 DisplayMetrics dm = new DisplayMetrics();
                 mDisplay.getMetrics(dm);
                 // calculate it here, but consider moving it elsewhere
@@ -521,8 +528,7 @@ public abstract class BaseStatusBar extends SystemUI implements
                             + thumbBgPadding + thumbLeftMargin);
                     y = (int) (dm.heightPixels
                             - res.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height) - thumbBgPadding);
-                } else { // if (config.orientation ==
-                         // Configuration.ORIENTATION_LANDSCAPE) {
+                } else { // if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
                     float thumbTopMargin = res
                             .getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_top_margin);
                     float thumbBgPadding = res