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

Commit 29c1e038 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary null checking on ViewRootImpl#mWindowAttribute"

parents 038b2d7c 8b9d7baa

core/java/android/view/ViewRootImpl.java

+2 −4
Original line number Diff line number Diff line
@@ -3092,8 +3092,7 @@ public final class ViewRootImpl implements ViewParent, 


        if (changedVisibility || regainedFocus) {

            // Toasts are presented as notifications - don't present them as windows as well

            boolean isToast = (mWindowAttributes == null) ? false

                    : (mWindowAttributes.type == TYPE_TOAST);

            boolean isToast = mWindowAttributes.type == TYPE_TOAST;

            if (!isToast) {

                host.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

            }
@@ -3258,8 +3257,7 @@ public final class ViewRootImpl implements ViewParent, 
                if (mAttachInfo.mThreadedRenderer != null && mSurface.isValid()) {

                    mFullRedrawNeeded = true;

                    try {

                        final WindowManager.LayoutParams lp = mWindowAttributes;

                        final Rect surfaceInsets = lp != null ? lp.surfaceInsets : null;

                        final Rect surfaceInsets = mWindowAttributes.surfaceInsets;

                        mAttachInfo.mThreadedRenderer.initializeIfNeeded(

                                mWidth, mHeight, mAttachInfo, mSurface, surfaceInsets);

                    } catch (OutOfResourcesException e) {