From c9eab5fa9021cd91c350cda7fa953b1e451138c7 Mon Sep 17 00:00:00 2001
From: Anna Galusza <agalusza@google.com>
Date: Tue, 5 Apr 2016 17:42:19 -0700
Subject: [PATCH] Fix issue where (accessibility) keyboard mode callbacks were
 not always called. Bug: 28007101

Change-Id: Ie7f992243e5a71bc6fed74cbc0d242d652d7fc12
---
 .../server/accessibility/AccessibilityManagerService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index e256ecd6b85e8..f5e8299ade99f 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1795,9 +1795,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
                 }
                 userState.mSoftKeyboardShowMode = 0;
                 userState.mServiceChangingSoftKeyboardMode = null;
+                notifySoftKeyboardShowModeChangedLocked(userState.mSoftKeyboardShowMode);
             }
-
-            notifySoftKeyboardShowModeChangedLocked(userState.mSoftKeyboardShowMode);
         }
     }
 
@@ -4355,6 +4354,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
                     }
                 } else if (mAccessibilitySoftKeyboardModeUri.equals(uri)) {
                     if (readSoftKeyboardShowModeChangedLocked(userState)) {
+                        notifySoftKeyboardShowModeChangedLocked(userState.mSoftKeyboardShowMode);
                         onUserStateChangedLocked(userState);
                     }
                 }