Revert "Move binder call to bg thread"

This reverts commit de97cfd06439ce1bb62709f7bf8070a7f830f13f.

Reason for revert: CtsWindowManagerDeviceTestCases

Change-Id: I57a397d3830505a5004fe647ccbd95ac5f0168e9

2 files changed, 2 insertions, 10 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
index abc8fdc70df7..730f88ab9f8f 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
@@ -625,7 +625,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
                     }
                 }, mainExecutor, bgExecutor);
 
-        mView.setBackgroundExecutor(bgExecutor);
         mView.setEdgeBackGestureHandler(mEdgeBackGestureHandler);
         mNavBarMode = mNavigationModeController.addListener(mModeChangedListener);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
index b01dca1a0365..ad3cfa359a52 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
@@ -88,7 +88,6 @@ import com.android.wm.shell.pip.Pip;
 import java.io.PrintWriter;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 /** */
@@ -98,8 +97,6 @@ public class NavigationBarView extends FrameLayout {
 
     final static boolean ALTERNATE_CAR_MODE_UI = false;
 
-    private Executor mBgExecutor;
-
     // The current view is one of mHorizontal or mVertical depending on the current configuration
     View mCurrentView = null;
     private View mVertical;
@@ -352,10 +349,6 @@ public class NavigationBarView extends FrameLayout {
         notifyVerticalChangedListener(mIsVertical);
     }
 
-    public void setBackgroundExecutor(Executor bgExecutor) {
-        mBgExecutor = bgExecutor;
-    }
-
     public void setTouchHandler(Gefingerpoken touchHandler) {
         mTouchHandler = touchHandler;
     }
@@ -775,8 +768,8 @@ public class NavigationBarView extends FrameLayout {
         updateSlippery();
         reloadNavIcons();
         updateNavButtonIcons();
-        mBgExecutor.execute(() -> WindowManagerWrapper.getInstance()
-                .setNavBarVirtualKeyHapticFeedbackEnabled(!mShowSwipeUpUi));
+        WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(
+                !mShowSwipeUpUi);
         getHomeButton().setAccessibilityDelegate(
                 mShowSwipeUpUi ? mQuickStepAccessibilityDelegate : null);
     }