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

Commit bca1c4ff authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #3271486: SetupWizward NullPointerException in"

parents a58fd15a fb3806d6

core/java/android/app/ActivityThread.java

+11 −9
Original line number Diff line number Diff line
@@ -2334,6 +2334,7 @@ public final class ActivityThread { 
                }

            }



            if (thumbnail != null) {

                Canvas cv = mThumbnailCanvas;

                if (cv == null) {

                    mThumbnailCanvas = cv = new Canvas();
@@ -2344,6 +2345,7 @@ public final class ActivityThread { 
                    mAvailThumbnailBitmap = thumbnail;

                    thumbnail = null;

                }

            }



        } catch (Exception e) {

            if (!mInstrumentation.onException(r.activity, e)) {