Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd1e9ad8 authored by Anna Galusza's avatar Anna Galusza Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where service disabled with disableSelf() would not reset soft... 

Merge "Fix bug where service disabled with disableSelf() would not reset soft keyboard behavior. Bug: 27947344" into nyc-dev
parents 063988c4 8a12f640

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+9 −4
Original line number Diff line number Diff line
@@ -1784,10 +1784,15 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                    userState.mEnabledServices.contains(userState.mServiceChangingSoftKeyboardMode);



            if (!serviceChangingSoftKeyboardModeIsEnabled) {

                final long identity = Binder.clearCallingIdentity();

                try {

                    Settings.Secure.putIntForUser(mContext.getContentResolver(),

                            Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE,

                            0,

                            userState.mUserId);

                } finally {

                    Binder.restoreCallingIdentity(identity);

                }

                userState.mSoftKeyboardShowMode = 0;

                userState.mServiceChangingSoftKeyboardMode = null;

            }