Merge "check for parent before embedding titlebar"
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) {