Focus window can handle null windows. Revert the null check (#2666)

MozillaReality · Jan 17, 2020 · 446f824 · 446f824
1 parent 5b6c98e
commit 446f824
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -383,7 +383,7 @@ public void moveWindowLeft(@NonNull WindowWidget aWindow) {
         }
     }
 
-    public void focusWindow(@NonNull WindowWidget aWindow) {
+    public void focusWindow(@Nullable WindowWidget aWindow) {
         if (aWindow != mFocusedWindow) {
             WindowWidget prev = mFocusedWindow;
             mFocusedWindow = aWindow;
@@ -518,15 +518,10 @@ public void enterPrivateMode() {
 
         if (mPrivateWindows.size() == 0) {
             WindowWidget window = addWindow();
-            if (window != null) {
-                window.loadHome();
-            }
+            window.loadHome();
 
         } else {
-            WindowWidget window = getWindowWithPlacement(mRegularWindowPlacement);
-            if (window != null) {
-                focusWindow(window);
-            }
+            focusWindow(getWindowWithPlacement(mPrivateWindowPlacement));
         }
         updateViews();
         mWidgetManager.pushWorldBrightness(this, WidgetManagerDelegate.DEFAULT_DIM_BRIGHTNESS);