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

Commit 5e83d37e authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am: f38f9ca5... 

Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am: f38f9ca5 am: 7ba78da3 am: 10e870c7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2232548



Change-Id: I6c7e4f24e628d03812100ac296e91458455c0d7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc9164b6 10e870c7

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

+0 −9
Original line number Diff line number Diff line
@@ -728,7 +728,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        intentFilter.addAction(Intent.ACTION_USER_SWITCHED);

        intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);

        intentFilter.addAction(Intent.ACTION_USER_REMOVED);

        intentFilter.addAction(Intent.ACTION_USER_PRESENT);

        intentFilter.addAction(Intent.ACTION_SETTING_RESTORED);



        mContext.registerReceiverAsUser(new BroadcastReceiver() {
@@ -746,14 +745,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    unlockUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));

                } else if (Intent.ACTION_USER_REMOVED.equals(action)) {

                    removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));

                } else if (Intent.ACTION_USER_PRESENT.equals(action)) {

                    // We will update when the automation service dies.

                    synchronized (mLock) {

                        AccessibilityUserState userState = getCurrentUserStateLocked();

                        if (readConfigurationForUserStateLocked(userState)) {

                            onUserStateChangedLocked(userState);

                        }

                    }

                } else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {

                    final String which = intent.getStringExtra(Intent.EXTRA_SETTING_NAME);

                    if (Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES.equals(which)) {