Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4dd3017 authored by Michael Jurka's avatar Michael Jurka
Browse files

Debug code for window transition crash 

https://b.corp.google.com/7060284

- Throw exception before we try to start window
transition with null thumb
- also remove some old unneeded debug code

Change-Id: Ic9693372724cbfaa4c4cb2594128ca10677d9d8f
parent e94831e5

packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

+3 −7
Original line number Diff line number Diff line
@@ -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);

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+8 −2
Original line number Diff line number Diff line
@@ -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