diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java
index cc5a792e89a1a..11353f67a7994 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java
@@ -51,26 +51,19 @@ public class AccessibilityFloatingMenuController implements
     private int mBtnMode;
     private String mBtnTargets;
     private boolean mIsKeyguardVisible;
-    private boolean mIsAccessibilityManagerServiceReady;
 
     @VisibleForTesting
     final KeyguardUpdateMonitorCallback mKeyguardCallback = new KeyguardUpdateMonitorCallback() {
-        // Accessibility floating menu needs to retrieve information from
-        // AccessibilityManagerService, and it would be ready before onUserUnlocked().
+
         @Override
         public void onUserUnlocked() {
-            mIsAccessibilityManagerServiceReady = true;
             handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);
         }
 
-        // Keyguard state would be changed before AccessibilityManagerService is ready to retrieve,
-        // need to wait until receive onUserUnlocked().
         @Override
         public void onKeyguardVisibilityChanged(boolean showing) {
             mIsKeyguardVisible = showing;
-            if (mIsAccessibilityManagerServiceReady) {
-                handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);
-            }
+            handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);
         }
 
         @Override
@@ -99,7 +92,6 @@ public class AccessibilityFloatingMenuController implements
         mKeyguardUpdateMonitor = keyguardUpdateMonitor;
 
         mIsKeyguardVisible = false;
-        mIsAccessibilityManagerServiceReady = false;
     }
 
     /**