Merge "Update the navbar surface when the nav bar is detached" into udc-dev...

Merge "Update the navbar surface when the nav bar is detached" into udc-dev am: 05f4f569 am: 763da625

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21891001



Change-Id: I0c94f1526ce9b973268c419602f79064a1fbe857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

@@ -839,6 +839,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
         }
         mFrame = null;
         mOrientationHandle = null;
+        notifyNavigationBarSurface();
     }
 
     // TODO: Remove this when we update nav bar recreation
@@ -1003,7 +1004,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
 
     private void notifyNavigationBarSurface() {
         ViewRootImpl viewRoot = mView.getViewRootImpl();
-        SurfaceControl surface = viewRoot != null
+        SurfaceControl surface = mView.getParent() != null 
+                && viewRoot != null
                 && viewRoot.getSurfaceControl() != null
                 && viewRoot.getSurfaceControl().isValid()
                         ? viewRoot.getSurfaceControl()