commit b05b93a674804f38d327b24e3d660adc3ad8c982
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 23 12:57:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 23 12:57:58 2016 +0000
tree dbe4ca9989319ec470f4707e9238b9d6ea61d61d
parent bc3d106b9707347f81628550dc89950bc1c0953a
parent f7abcda5f22cde86666aeedbf1cc2a99b47ec2c2

Merge "Provide synchronization to setview to avoid NPE"

core/java/android/view/WindowManagerGlobal.java

diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index 11734d3..830df99 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -335,20 +335,17 @@
             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);
+            // 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.
                 if (index >= 0) {
                     removeViewLocked(index, true);
                 }
+                throw e;
             }
-            throw e;
         }
     }