commit 818c04ce8cc422567c3d4cc2fb35ea8cc1a502ee
author Michael Kolb <kolby@google.com> Wed Aug 17 11:00:56 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 17 11:00:56 2011 -0700
tree 93a86f7f5c3689cac9724ebbaf9952cb582f7669
parent b43f2f6fbc7d8c0d5f66e9e72c1ae99dbac5efaf
parent 199e43c5208d96db80caabb2b28c31080c0dc6b7

Merge "check for parent before embedding titlebar"

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 052d97e..009989b 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -323,9 +323,11 @@
     }
 
     private void finishAnimationIn() {
-        // notify accessibility manager about the screen change
-        mNavScreen.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
-        mTabControl.setOnThumbnailUpdatedListener(mNavScreen);
+        if (mNavScreen != null) {
+            // notify accessibility manager about the screen change
+            mNavScreen.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+            mTabControl.setOnThumbnailUpdatedListener(mNavScreen);
+        }
     }
 
     void hideNavScreen(boolean animate) {