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

Commit 42a99377 authored by Gopal Krishna Shukla's avatar Gopal Krishna Shukla Committed by android-build-merger
Browse files

Merge "Provide synchronization to setview to avoid NPE" am: b05b93a6 am:... 

Merge "Provide synchronization to setview to avoid NPE" am: b05b93a6 am: 810c31fd am: 621e87d7
am: 260af963

Change-Id: I1907b2252ae2fa25667b3a0484f6852660c74da3
parents 7d46dd7e 260af963

core/java/android/view/WindowManagerGlobal.java

+6 −9
Original line number Diff line number Diff line
@@ -335,22 +335,19 @@ public final class WindowManagerGlobal { 
            mViews.add(view);

            mRoots.add(root);

            mParams.add(wparams);

        }



            // do this last because it fires off messages to start doing things

            try {

                root.setView(view, wparams, panelParentView);

            } catch (RuntimeException e) {

                // BadTokenException or InvalidDisplayException, clean up.

            synchronized (mLock) {

                final int index = findViewLocked(view, false);

                if (index >= 0) {

                    removeViewLocked(index, true);

                }

            }

                throw e;

            }

        }

    }



    public void updateViewLayout(View view, ViewGroup.LayoutParams params) {

        if (view == null) {