Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev

am: 70c72263ac Change-Id: I087ed38bdad56f6b6549fd3ab8a08bb66be22a7b
2017-07-24 20:35:05 +00:00
parent aa8c437d30 70c72263ac
commit 2c358c08ef
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/app/assist/AssistStructure.java
+++ b/core/java/android/app/assist/AssistStructure.java
@@ -1905,6 +1905,10 @@ public class AssistStructure implements Parcelable {
                activity.getActivityToken());
        for (int i=0; i<views.size(); i++) {
            ViewRootImpl root = views.get(i);
+            if (root.getView() == null) {
+                Log.w(TAG, "Skipping window with dettached view: " + root.getTitle());
+                continue;
+            }
            mWindowNodes.add(new WindowNode(this, root, forAutoFill, flags));
        }
    }