Merge "Cleanup: Remove setHasNavigationBar()" into main

6 files changed, 1 insertions, 68 deletions

diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 98d1ef6057fd..7018ebcbe9f4 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -408,7 +408,4 @@ oneway interface IStatusBar
     * @param displayId the id of the current display.
     */
     void moveFocusedTaskToDesktop(int displayId);
-
-    /** Set whether the display should have a navigation bar. */
-    void setHasNavigationBar(int displayId, boolean hasNavigationBar);
 }
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
index babb64050ed5..5fa0095d2329 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
@@ -318,13 +318,6 @@ public class NavigationBarControllerImpl implements
                 navBarView.showPinningEscapeToast();
             }
         }
-
-        @Override
-        public void setHasNavigationBar(int displayId, boolean hasNavigationBar) {
-            if (enableDisplayContentModeManagement()) {
-                mHasNavBar.put(displayId, hasNavigationBar);
-            }
-        }
     };
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 1720898229a5..97de61969ffb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -184,7 +184,6 @@ public class CommandQueue extends IStatusBar.Stub implements
     private static final int MSG_SET_SPLITSCREEN_FOCUS = 81 << MSG_SHIFT;
     private static final int MSG_TOGGLE_QUICK_SETTINGS_PANEL = 82 << MSG_SHIFT;
     private static final int MSG_WALLET_ACTION_LAUNCH_GESTURE = 83 << MSG_SHIFT;
-    private static final int MSG_SET_HAS_NAVIGATION_BAR = 84 << MSG_SHIFT;
     private static final int MSG_DISPLAY_REMOVE_SYSTEM_DECORATIONS = 85 << MSG_SHIFT;
     public static final int FLAG_EXCLUDE_NONE = 0;
     public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -588,12 +587,6 @@ public class CommandQueue extends IStatusBar.Stub implements
          * @see IStatusBar#moveFocusedTaskToDesktop(int)
          */
         default void moveFocusedTaskToDesktop(int displayId) {}
-
-        /**
-         * @see IStatusBar#setHasNavigationBar(int, boolean)
-         */
-        default void setHasNavigationBar(int displayId, boolean hasNavigationBar) {
-        }
     }
 
     @VisibleForTesting
@@ -1532,14 +1525,6 @@ public class CommandQueue extends IStatusBar.Stub implements
         mHandler.obtainMessage(MSG_ENTER_DESKTOP, args).sendToTarget();
     }
 
-    @Override
-    public void setHasNavigationBar(int displayId, boolean hasNavigationBar) {
-        synchronized (mLock) {
-            mHandler.obtainMessage(MSG_SET_HAS_NAVIGATION_BAR, displayId,
-                    hasNavigationBar ? 1 : 0).sendToTarget();
-        }
-    }
-
 
     private final class H extends Handler {
         private H(Looper l) {
@@ -2072,11 +2057,6 @@ public class CommandQueue extends IStatusBar.Stub implements
                     }
                     break;
                 }
-                case MSG_SET_HAS_NAVIGATION_BAR:
-                    for (int i = 0; i < mCallbacks.size(); i++) {
-                        mCallbacks.get(i).setHasNavigationBar(msg.arg1, msg.arg2 != 0);
-                    }
-                    break;
             }
         }
     }
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
index a80b1b2dd9e8..fab19b6b8201 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
@@ -284,11 +284,4 @@ public interface StatusBarManagerInternal {
 
     /** Passes through the given shell commands to SystemUI */
     void passThroughShellCommand(String[] args, FileDescriptor fd);
-
-    /**
-     * Set whether the display should have a navigation bar.
-     *
-     * TODO(b/390591772): Refactor this method
-     */
-    void setHasNavigationBar(int displayId, boolean hasNavigationBar);
 }
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index c546388e4499..da9d01675984 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -1011,23 +1011,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D
         public void passThroughShellCommand(String[] args, FileDescriptor fd) {
             StatusBarManagerService.this.passThroughShellCommand(args, fd);
         }
-
-        @Override
-        public void setHasNavigationBar(int displayId, boolean hasNavigationBar) {
-            if (isVisibleBackgroundUserOnDisplay(displayId)) {
-                if (SPEW) {
-                    Slog.d(TAG, "Skipping setHasNavigationBar for visible background user "
-                            + mUserManagerInternal.getUserAssignedToDisplay(displayId));
-                }
-                return;
-            }
-            IStatusBar bar = mBar;
-            if (bar != null) {
-                try {
-                    bar.setHasNavigationBar(displayId, hasNavigationBar);
-                } catch (RemoteException ex) {}
-            }
-        }
     };
 
     private final GlobalActionsProvider mGlobalActionsProvider = new GlobalActionsProvider() {
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 5090ed04fee1..10f591cfd379 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -756,20 +756,7 @@ public class DisplayPolicy {
             return;
         }
 
-        final boolean hasNavigationBar = mDisplayContent.isSystemDecorationsSupported();
-        if (mHasNavigationBar == hasNavigationBar) {
-            return;
-        }
-
-        mHasNavigationBar = hasNavigationBar;
-        mHandler.post(
-                () -> {
-                    final int displayId = getDisplayId();
-                    StatusBarManagerInternal statusBar = getStatusBarManagerInternal();
-                    if (statusBar != null) {
-                        statusBar.setHasNavigationBar(displayId, mHasNavigationBar);
-                    }
-                });
+        mHasNavigationBar = mDisplayContent.isSystemDecorationsSupported();
     }
 
     public boolean hasStatusBar() {